Paul
e5c4240ae0
Merge remote-tracking branch 'origin/main' into amo/sendout-upgrade
...
# Conflicts:
# CHANGELOG.md
# forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt
2024-02-09 20:22:27 +10:00
Licious
943d6e0c55
Dynamic lighting compat
2024-02-03 21:49:27 +00:00
Paul
bf9c54e539
Merge remote-tracking branch 'origin/main' into amo/sendout-upgrade
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.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/pokemon/JsonPokemonPoseableModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/Poseable.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
2024-01-07 13:28:42 +10:00
Paul
9cc63b59e6
Fixed forge runs
2024-01-04 21:44:37 +10:00
amo
a786adee9e
Merge branch 'evolution-effect' into amo/balls
...
# Conflicts:
# common/src/main/java/com/cobblemon/mod/common/mixin/GameRendererMixin.java
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelGuiFactory.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt
# common/src/main/resources/assets/cobblemon/particles/snowstorm.json
# common/src/main/resources/mixins.cobblemon-common.json
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
2024-01-03 15:02:26 +00:00
Apion
f82fa2b4e6
Improve Berry Rendering Perf
2024-01-03 07:35:27 +00:00
dhi_holo
6a8822ca76
Undone what was done before
...
Given it exists in another branch, and this was just me learning anyway, removed the ore from this branch.
2024-01-01 19:50:36 +10:00
dhi_holo
2595d6ee91
Tags for Ore!
...
Adds block and item tags for each evolution store ore type, as well as adding the ores to the modloader tags properly, making it match with how ores are handled regularly.
Also boat tags.
2023-12-28 06:04:51 +10:00
dhi_holo
5c7d96897d
Generation Sucks, Please Help
...
Added basically everything for Netherrack Fire Stone Ore, but the generation doesn't work and I'm not sure why. Feel free to investigate it, won't merge until it's solved.
2023-12-27 18:50:53 +10:00
Paul
22441e0b09
More evo effect reworking
2023-12-23 08:20:36 +10:00
Paul
8418bc87c8
Merge remote-tracking branch 'origin/main' into evolution-effect
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonEntities.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/adapter/flatfile/NBTStoreAdapter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt
2023-12-22 15:41:11 +10:00
Licious
942bf8247e
Consistent names aren't my specialty okay?
2023-11-02 22:44:26 +00:00
Licious
d6a991e81e
Fix various potion related issues.
2023-11-02 22:43:33 +00:00
Hiroku
d299cad9db
Merge branch 'main' into 'licious/a-sign-of-boats-to-come'
...
# Conflicts:
# CHANGELOG.md
2023-11-01 20:35:35 +00:00
Licious
41d7740374
Merge branch 'main' into licious/a-sign-of-boats-to-come
...
# Conflicts:
# CHANGELOG.md
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
# common/src/main/resources/mixins.cobblemon-common.json
2023-10-31 23:44:21 +00:00
Licious
29f0c6f7bc
Rework LootInjector functionality, fix Forge.
2023-10-31 23:38:17 +00:00
Licious
5f55cbb5d3
Implement Apricorn boats & signs, pending texture approval. Fix a few missing item tags in CobblemonItemTags. Added support for injecting into specific points of ItemGroups.
2023-10-28 15:20:08 +01:00
dhi_holo
f2c459cc06
Pain, Suffering Even
...
Moved the tags to only be in their respective modloaders, that took way too long to figure out, updated the Forge version to what Farmer's Delight uses because of failed testing, and added this to the changelog
2023-10-22 15:39:19 +10:00
Paul
36251fea75
Merge remote-tracking branch 'origin/main' into evolution-effect
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt
# common/src/main/resources/assets/cobblemon/particles/snowstorm.json
# deps/local/com/bedrockk/molang/1.1.5/molang-1.1.5.pom
2023-10-20 19:28:23 +10:00
amo
05f089d390
attempt to fix particle materials but fabric fucking sucks
2023-10-19 17:01:05 +01:00
Licious
b3255045fa
Fix compatibility with the Forge version of Carry On, add compatibility for Adorn.
2023-10-18 22:17:35 +01:00
Licious
5868d39431
Rework Composter item registration to be platform implementation specific.
2023-10-17 19:53:48 +01:00
Paul
1570bbf42b
Remove flywheel, for now
2023-10-13 14:59:23 +10:00
Hiroku
b3757113ac
Merge branch 'pokemon-drops' into 'main'
...
Pokemon drops
Closes #552
See merge request cable-mc/cobblemon!678
2023-10-12 21:29:06 +00:00
Paul
747aedca27
Fixed battle tile animations having the zoomies in Forge
2023-10-09 08:45:10 +10:00
miasmus
a7fed0d042
gen 5 drops, edits for consistency
2023-10-08 18:38:57 -04:00
Deltric
a84a2aac58
Progress on resource fix
2023-10-06 22:10:51 -05: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
Paul
ae41d4ac58
Fixed Forge pasture block issues wherever pasture blocks are near the world center, closes #518
2023-09-29 10:21:53 +10:00
apion
72b6f46c4b
Merge branch 'main' into berry-with-flywheel
2023-09-14 21:04:28 -04:00
Paul
0ee4f60391
Fixed bad registration of processor types on Forge
2023-09-12 20:26:52 +10:00
Hiroku
19a85276af
Reworked berry generation in villages using their own structures, rarity & gen fixes
2023-09-09 20:55:30 +00:00
apion
914067038a
Fix forge client, fix flower models
2023-09-06 11:13:28 -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
d8f9f8926b
Berries
2023-09-02 06:05:40 +00: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
Paul
a877ad5a69
Merge branch 'berry' into evolution-effect
...
# Conflicts:
# 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/VaryingModelRepository.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt
2023-08-27 14:11:55 +10:00
apion
8b857881a8
Merge branch 'implementing-naturally-generated-structures' into berry
2023-08-17 05:09:26 -04:00
apion
995a8c2dc0
Got structure processor + overrides working
2023-08-17 05:08:00 -04:00
apion
90b8923b98
Merge branch 'main' into implementing-naturally-generated-structures
...
# Conflicts:
# common/src/main/resources/cobblemon-common.accesswidener
# common/src/main/resources/mixins.cobblemon-common.json
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt
2023-08-15 22:17:11 -04:00
apion
9a7e4d05f0
Added JEI integration for berry mutations
2023-08-15 21:35:35 -04:00
Paul
4d3030e20e
Merge stuff
2023-07-15 18:37:47 +10:00
Licious
afafe35d16
1.20.1
2023-07-08 23:10:22 +00:00
Hiroku
452ff46815
Added Vivichokes
2023-07-07 00:43:42 +00:00
Nick
765421fc5f
Fixes forge maven deployments being hit with a missing access widener error
2023-06-26 23:03:49 -07:00
Paul
331278d1b3
Finalized brewing mechanism, added incorrectly-textured medicinal brew w/ recipe
2023-06-17 20:13:35 +10:00
Paul
669a119bf5
Merge remote-tracking branch 'origin/custom-brewing-basis-1.19.3' into revival-herbs
...
# Conflicts:
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt
2023-06-17 12:24:34 +10:00