 apion
|
247c475c2d
|
Fix oversight in incendium fix
|
2024-05-09 23:44:04 -04:00 |
|
|
apion
|
b5d7786ff7
|
Fixes #823
|
2024-05-09 20:05:03 -04:00 |
|
|
apion
|
88e301d7c8
|
Fixed adorn compat
|
2024-05-09 18:53:44 -04:00 |
|
|
apion
|
0b93481dbf
|
Remove unneeded imports
|
2024-04-27 13:10:21 -04:00 |
|
|
apion
|
dda004a66c
|
Change default run configs to generate with a uuid and username
|
2024-04-27 13:05:44 -04:00 |
|
|
apion
|
9648a91f4a
|
Fixed fabric server run config, split client and server run folders
|
2024-04-26 20:35:50 -04:00 |
|
 apionandJazzMcNade
|
eea7477f7f
|
More changes to how things work in unloaded chunks
|
2024-03-14 01:19:10 -05:00 |
|
|
apion
|
9e2d00df63
|
Finished Anorith, Armaldo, Tyrantrum, Zorua, Zoroark, ZoruaH
|
2024-02-28 11:11:37 -05:00 |
|
|
apion
|
e8003bb29a
|
Added a few comments
|
2024-02-28 04:15:02 -05:00 |
|
|
apion
|
a248d661fa
|
Finished omastar
|
2024-02-28 01:07:05 -05:00 |
|
|
apion
|
59390f4d84
|
Finished archen line
|
2024-02-28 01:00:51 -05:00 |
|
|
apion
|
99b7e4a89e
|
Finished tyrunt
|
2024-02-28 00:49:36 -05:00 |
|
|
apion
|
fb37e543cf
|
Fixed issues with json posers
|
2024-02-28 00:43:25 -05:00 |
|
|
apion
|
c0c75a9735
|
Finished Rowlet line
|
2024-02-28 00:25:58 -05:00 |
|
|
apion
|
3febee21b6
|
Changed increment of debug keybindings
|
2024-02-28 00:03:44 -05:00 |
|
|
apion
|
c3a017687c
|
Finished Gen VIII fossil mons
|
2024-02-28 00:01:05 -05:00 |
|
|
apion
|
afd082c966
|
Added scaling/translation key binds to portrait view, enableable/disableable via config
|
2024-02-27 23:34:52 -05:00 |
|
|
apion
|
a6a1f7b75b
|
Added scaling/translation keybinds to summary menu
|
2024-02-27 22:00:10 -05:00 |
|
|
apion
|
72738a45e6
|
Made portraitScale, portraitTranslation, profileScale, and profileTranslation vars instead of vals in every model file
|
2024-02-27 21:46:44 -05:00 |
|
|
apion
|
8a0076acb4
|
Start working on dragovish
|
2024-02-27 20:54:53 -05:00 |
|
|
apion
|
f7e1def555
|
Fixed arctovish scaling and translations
|
2024-02-27 20:45:44 -05:00 |
|
|
apion
|
c13f6ae627
|
Implemented Ferrothorn, fixed missing anim on Dragonair
|
2024-02-27 19:12:39 -05:00 |
|
|
apion
|
0397e39735
|
I have become the very thing I swore to destroy (Pushing a license to main D:)
|
2024-02-19 20:18:55 -05:00 |
|
|
apion
|
a68b6928aa
|
Made it so when a snapshot build is built the commit hash and branch is included
|
2024-02-03 23:26:32 -05:00 |
|
|
apion
|
0c8318d317
|
Licenses :P
|
2024-02-03 22:46:04 -05:00 |
|
|
apion
|
8d80bcfd6b
|
Fixed remaining patterns
|
2024-02-03 22:45:26 -05:00 |
|
|
apion
|
cfd4fa1785
|
Fix dome, helix, and sus patterns
|
2024-02-03 22:35:56 -05:00 |
|
|
apion
|
86bd70177c
|
Sherds work :O
|
2024-02-03 22:28:57 -05:00 |
|
|
apion
|
7d82a2f7c8
|
Start working on injecting sherd textures, bunch of immutable maps need to not be immutable
|
2024-02-02 20:53:04 -05:00 |
|
|
apion
|
c571d79035
|
Added sherd tag
|
2024-02-02 19:48:31 -05:00 |
|
|
apion
|
d36c24075c
|
Fixed rotations?
|
2024-01-29 16:48:21 -05:00 |
|
|
apion
|
02fb825328
|
Update Gimmighoul model, add disguised chest block entity, gilded chests now save contents
|
2024-01-08 14:05:09 -05:00 |
|
|
apion
|
1376bb68f4
|
Tried again, failed again
|
2024-01-07 11:53:38 -05:00 |
|
|
apion
|
beb8f2ccf1
|
Merge branch 'main' into gimmighoul_gholdengo
# Conflicts:
# CHANGELOG.md
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/PokemonDTO.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
# common/src/main/resources/assets/cobblemon/sounds.json
# common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json
|
2024-01-07 10:41:34 -05:00 |
|
|
apion
|
7c164fc4c8
|
Revert "Added BotanyPots integration"
This reverts commit 846acaef88.
|
2024-01-07 02:28:40 -05:00 |
|
|
apion
|
e314664731
|
Throw some stuff in and hope Hiro can fix it (I need a hero! I'm holding out for a hero...)
|
2024-01-04 07:31:29 -05:00 |
|
|
apion
|
d0a38a9704
|
Add chest assets, do some work on getting chest animation working
|
2024-01-04 06:48:59 -05:00 |
|
|
apion
|
5a6a83aac1
|
Cleanup, add new model
|
2024-01-03 23:50:55 -05:00 |
|
|
apion
|
ec43a78ae4
|
Merge branch 'main' into archaeology
|
2023-12-20 22:48:50 -05:00 |
|
|
apion
|
7c860d8f91
|
Fix some of seg's review threads
|
2023-11-30 12:39:09 -05:00 |
|
|
apion
|
006e86f3c3
|
Fix my review threads
|
2023-11-30 11:37:52 -05:00 |
|
|
apion
|
cfd90fac04
|
Fixed sherd names
|
2023-11-20 23:20:44 -05:00 |
|
|
apion
|
1cf2359195
|
Bumped ver number and fixed visual formation bug
|
2023-11-20 23:16:13 -05:00 |
|
|
apion
|
3e58229a89
|
Fixed another formation issue
|
2023-11-20 20:56:23 -05:00 |
|
|
apion
|
d76f1524bd
|
Added sherd items and a creative tab for archeology.
|
2023-11-20 06:44:18 -05:00 |
|
|
apion
|
58b5eb155d
|
Fixed sounds and hoppers putting material in to finished machines
|
2023-11-20 04:07:32 -05:00 |
|
|
apion
|
5262972a8d
|
Start working on hopper for tubes
|
2023-11-20 03:39:30 -05:00 |
|
|
apion
|
011a095314
|
Dumb style thing
|
2023-11-20 01:13:08 -05:00 |
|
|
apion
|
3520c50541
|
Fixed issue where adjacent machines didn't form properly
|
2023-11-20 01:01:39 -05:00 |
|
|
apion
|
72bba7fdfd
|
Allowed for use of tags for natural materials
|
2023-11-18 06:19:08 -05:00 |
|
|
apion
|
a258e48582
|
Pokemon now stay suspended in the tank when it finishes
|
2023-11-18 02:58:56 -05:00 |
|
|
apion
|
21a15686b2
|
Added full tube texture
|
2023-11-18 02:26:11 -05:00 |
|
|
apion
|
d847972bb1
|
Fixed issue where you couldn't form a multiblock from previously formed blocks, also fixed the no block update when fossils are inserted
|
2023-11-18 01:06:45 -05:00 |
|
|
apion
|
3dbcc2d28c
|
Moved a bunch of stuff into the MultiblockStructure and out of the individual blockentities. Hopefully helps with the synchronization issues.
|
2023-11-16 06:41:38 -05:00 |
|
|
apion
|
b2b08ac098
|
Rollback apricorn plank model change (but fr this time)
|
2023-10-06 22:08:19 -04:00 |
|
|
apion
|
e5f0911b83
|
Rollback apricorn plank model change
|
2023-10-06 21:52:29 -04:00 |
|
|
apion
|
d550d775a6
|
Fix dependency notation for flywheel
|
2023-10-05 22:05:01 -04:00 |
|
|
apion
|
e572584dbf
|
Remove render caching stuff from BerryBlockEntities
|
2023-10-05 22:02:03 -04:00 |
|
|
apion
|
6ac58cf7c2
|
Added fallback to vanilla renderer
|
2023-10-05 21:56:04 -04:00 |
|
|
apion
|
e8a1e66658
|
Merge branch 'main' into berry-with-flywheel
|
2023-10-05 21:44:55 -04:00 |
|
|
apion
|
9c67d0ad6f
|
Fixed forge build
|
2023-10-05 21:42:00 -04:00 |
|
|
apion
|
0747d08a90
|
Forge build not working, pushing to compare
|
2023-10-05 21:17:11 -04:00 |
|
|
apion
|
299ab3d5f7
|
Merge branch 'main' into berry-with-flywheel
|
2023-10-05 21:05:32 -04:00 |
|
|
apion
|
47deb6504b
|
Get flywheel packaged into the fabric built jar, fix some create conflicts
|
2023-10-04 19:21:58 -04:00 |
|
|
apion
|
f563f69afd
|
Fixing rotations
|
2023-09-15 02:45:21 -04:00 |
|
|
apion
|
72b6f46c4b
|
Merge branch 'main' into berry-with-flywheel
|
2023-09-14 21:04:28 -04:00 |
|
|
apion
|
ee63bf0eab
|
Fixes issue #484 (this is what you get for using regexes Hiroku)
|
2023-09-13 15:54:18 -04:00 |
|
|
apion
|
a8ac109a50
|
Allowed for the use of existing berry models in flywheel optimizations
|
2023-09-08 18:34:51 -04:00 |
|
|
apion
|
fbe31f3232
|
Try rendering berry trees with flywheel
|
2023-09-08 11:52:18 -04:00 |
|
|
apion
|
41b9411d06
|
Merge branch 'berry' into berry-perf-improvements
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/BerryBlockEntity.kt
|
2023-09-07 21:17:12 -04:00 |
|
|
apion
|
10033be4b5
|
Actually fix flower models
|
2023-09-06 11:19:54 -04:00 |
|
|
apion
|
914067038a
|
Fix forge client, fix flower models
|
2023-09-06 11:13:28 -04:00 |
|
|
apion
|
3b967933ca
|
Licenses
|
2023-09-04 16:35:43 -04:00 |
|
|
apion
|
665aad40a8
|
Added logic to rerender blocks when necessary
|
2023-09-04 16:32:23 -04:00 |
|
|
apion
|
527f429c20
|
Use guava cache now, evict entries after a minute
|
2023-09-04 15:13:56 -04:00 |
|
|
apion
|
6d3f3d1353
|
Fixed lighting issues (kinda)
|
2023-09-04 14:17:49 -04:00 |
|
|
apion
|
b70748e1b8
|
BerryBlockRenderer now caches vertices, improves perf by about 4x (HOORAY)
|
2023-09-04 05:53:56 -04:00 |
|
|
apion
|
d17f8f90b8
|
Made berry atlases actually work (only on Fabric for now, this is prototyped af)
|
2023-09-03 05:56:08 -04:00 |
|
|
apion
|
1d353bdc5b
|
Added hitboxes to the early stages of berry tree growth
|
2023-09-02 03:37:31 -04:00 |
|
|
apion
|
df7109ba45
|
Added flower model/texture, fixed particles in all the tree models
|
2023-09-02 03:15:39 -04:00 |
|
|
apion
|
457e7b65c9
|
Merge remote-tracking branch 'origin/berry' into berry
|
2023-09-02 01:36:35 -04:00 |
|
|
apion
|
755d4ea612
|
Added early stage growth models to all block states
|
2023-09-02 01:36:27 -04:00 |
|
|
apion
|
42235a35ee
|
Final asset sync (hopefully)
|
2023-09-02 00:59:01 -04:00 |
|
|
apion
|
d6e51b9c55
|
Merge remote-tracking branch 'origin/berry' into berry
|
2023-09-01 21:27:00 -04:00 |
|
|
apion
|
d2970c10b3
|
Added texture atlases for berries, fixed issue in Forge where berry models werent being loaded
|
2023-09-01 21:26:45 -04:00 |
|
|
apion
|
c3eb05e5c6
|
More asset sync (again) (YAY!) Also disabled berry tinting
|
2023-08-31 19:54:26 -04:00 |
|
|
apion
|
a82dee2beb
|
More asset sync (again) (YAY!) Also disabled berry tinting
|
2023-08-31 19:54:05 -04:00 |
|
|
apion
|
8099bfe330
|
Merge branch 'main' into berry
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt
|
2023-08-31 19:11:18 -04:00 |
|
|
apion
|
95d6a1c183
|
More asset sync
|
2023-08-31 00:08:02 -04:00 |
|
|
apion
|
4fd433b072
|
Actually fixed berries rendering when off screen (you were right the first time Hiroku)
|
2023-08-28 21:10:29 -04:00 |
|
|
apion
|
6e7694d650
|
Move some multiblock stuff into api, add licenses
|
2023-08-28 19:28:12 -04:00 |
|
|
apion
|
dc6804bba6
|
Moved mulch logic into the berry block entity
|
2023-08-28 18:50:55 -04:00 |
|
|
apion
|
a301779a42
|
Hopefully finalized system for synchronizing multiblocks
|
2023-08-28 17:14:20 -04:00 |
|
|
apion
|
440a07d1de
|
Fixed synchronization issue
|
2023-08-28 15:24:57 -04:00 |
|
|
apion
|
fc7951cbcd
|
Changed multiblock formation logic to use VoxelShape instead of Box, fix some misc rendering issues with the fossil block
|
2023-08-27 23:29:02 -04:00 |
|
|
apion
|
44b58ab9a0
|
Added the connecting bit to the fossil tube
|
2023-08-27 18:31:10 -04:00 |
|
|
apion
|
d24a6fa75c
|
Added monitor animation
|
2023-08-27 16:40:16 -04:00 |
|
|
apion
|
fca867a8b8
|
Asset organization stuff
|
2023-08-27 15:37:33 -04:00 |
|
|
apion
|
9514c48eaa
|
Add staged filling to the fossil tube
|
2023-08-27 11:42:45 -04:00 |
|
|
apion
|
d029b4380a
|
Separate some textures/models
|
2023-08-26 19:58:55 -04:00 |
|