Commit Graph
202 Commits
Author SHA1 Message Date
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
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
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
Paul 933ba72d04 Merge remote-tracking branch 'origin/main' into revival-herbs 2023-06-16 22:53:22 +10:00
Licious 5fa56177fc Tooltip changes 2023-06-15 21:19:22 +00:00
Licious 371f2ac08a Implemented LootTable injection 2023-06-13 17:21:39 +00:00
Paul 2cc44d32fb Added BeneathHeightmapPlacementModifier 2023-06-04 11:35:09 +10:00
jmmcp 36fcb12add Added potion recipes to access widener and an example recipe for it 2023-05-31 18:04:37 -04:00
Paul 63a779cb1e Fixed custom brewing recipes on Forge I think 2023-05-28 23:15:46 +10:00
Paul 4d5bc93702 Fixed Forge runs 2023-05-17 20:39:22 +10:00
Landon 058ac88f19 Add mints 2023-05-11 10:07:11 +00:00
Deltric 22ce696423 What seems backwards is actually forwards 2023-04-16 14:02:04 +00:00
Licious17 9c0babf267 Fix Forge client lifecycle stuff, runs work again 2023-04-06 10:16:06 +01:00
Paul 65ac3319f3 Updated from main 2023-04-01 18:48:22 +10:00
Paul 045b9fbc9a Merge remote-tracking branch 'origin/main' into 1.19.3
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PartyStore.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketRegistrar.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormParticleHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/MatrixWrapper.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonInBattleMovementGoal.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/storage/party/ReleasePCPokemonHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/storage/pc/ReleasePartyPokemonHandler.kt
#	common/src/main/resources/assets/cobblemon/models/item/link_cable.json
#	common/src/main/resources/cobblemon-common.accesswidener
2023-04-01 17:54:36 +10:00
Nick bf331a7471 Use transitive access wideners in favor of side-mod/plugin development 2023-03-28 04:57:48 +00:00
Yaseen 06335ca854 better way of adding pokecenters to structure pool 2023-03-27 02:02:50 +01:00
Licious17 f9cdd9d002 Several fixes & tweaks, Forge currently broken 2023-03-25 21:59:34 +00:00
JMMCP e8ea697caa Fixed various shinies and a couple misc. bugs 2023-03-21 22:12:50 +00:00
Nick e633c5f1b0 Update architectury + fabric API dependency requirements 2023-03-17 23:25:32 +00:00
Paul 2aa85c4254 Compile errors and general patching for 1.3 -> 1.4 2023-03-13 21:48:59 +10:00
Paul d576022219 Merge conflict stuff 2023-03-13 16:19:15 +10:00
Hiroku 1e33b4fc1d Kotlin4forge compat 2023-03-10 12:15:32 +00:00
Tyzillion f2cbf78144 Implemented many Pokemon. 2023-02-27 08:54:24 +00:00
Paul e8b23fd0be Fixed spawn packets esp on Forge, fixed various other packets, fixed party overlay again 2023-02-23 23:56:19 +10:00