Commit Graph
5266 Commits
Author SHA1 Message Date
dhi_holo af2ff7bbfa Gems
Type Gems given an item tag, and moved from Evolution Items to Archeology and Held Items
2024-02-21 17:11:17 +10:00
dhi_holo 4f3575b2c6 Poke Ball Materials and Bud Item Tag
adds the tumblestone clusters and buds to the item tags, and adds fire stone ore to each ore tag, but primarily

Redoes every Poké Ball recipe (besides Master) to use tags to handle the tier material, allowing datapacks to easily add alternate recipes besides Copper, Iron, Gold, or Diamonds
2024-02-21 16:41:41 +10:00
dhi_holo 98c248ef13 corrections
renaming some stuff to be prepared for the next step of this insane idea
2024-02-21 15:34:20 +10:00
dhi_holo 4a2c69d47c Tags on top of Tags
Added a very large amount of tags.
The different tiers of Poké balls, also the Apricorn balls so it's easier for people to see what balls count for that advancement, different healing and battle item types, some evolution item sets which made sense to make tags (may add more later, these ones were just the obvious ones to make thing easier for future), the three colours for tumblestones, machine blocks, as well as adding the fence gate item tag, and adding the new tumblestone stuff to the pickaxe tag (although they can still be mined with an axe, probably something that needs fixing)

Mod loader tags were not tested on Forge, due to a crash involving CobblemonEntities, but Fabric works all nicely
2024-02-21 15:29:55 +10:00
Apion b489e747bb Merge branch 'type_gem' into 'main'
added type gems

See merge request cable-mc/cobblemon!880
2024-02-20 13:22:41 +00:00
Lily 08f957e33b Update CHANGELOG.md 2024-02-19 21:32:30 -05:00
Lily e17d38c53a added type gems 2024-02-19 21:24:29 -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 6ca1d23f45 Merge branch 'no_more_pick_block' into 'main'
disallow pick-stacking blocks that are part of a multiblock structure to prevent weird issues with NBT copying

See merge request cable-mc/cobblemon!874
2024-02-19 23:38:26 +00:00
Hiroku 64d160020b Merge branch 'issue-745' into 'main'
Sobble Line Can Swim and Breathe Underwater

Closes #745

See merge request cable-mc/cobblemon!878
2024-02-16 06:36:50 +00:00
Dhyan Patel fb4c80f68c Sobble Line Can Swim and Breathe Underwater 2024-02-16 06:36:50 +00:00
Paul 2b5433f9da Added hit effect for pokemon receiving battle damage 2024-02-16 15:37:52 +10:00
Paul fe8e4dcaff Improved Pokémon pathfinding so they don't run through cactus and such so recklessly 2024-02-16 12:24:58 +10:00
Paul e0bd6766fc Fixed basculin stripe spawning 2024-02-16 11:37:16 +10:00
Paul 4da800d396 Fixed Arbok patterns not being used properly in spawn files 2024-02-16 11:19:24 +10:00
Lily da6a09c942 disallow pick-stacking blocks that are part of a multiblock structure to prevent weird issues with NBT copying 2024-02-12 17:40:39 -05:00
Nick 4217938ada Merge branch 'move-animations' into 'main'
Simplistic move animations

See merge request cable-mc/cobblemon!871
2024-02-10 22:51:29 +00:00
Hiroku 4c5f88db06 Simplistic move animations 2024-02-10 22:51:29 +00:00
Hiroku cfd743c4c0 Merge branch 'armor_trims' into 'main'
oops

See merge request cable-mc/cobblemon!872
2024-02-10 02:11:35 +00:00
Lily 1bbfc6dce5 Merge branch 'main' into armor_trims 2024-02-09 21:06:33 -05:00
Lily 6f2235c751 i swear if this doesn't work 2024-02-09 21:04:59 -05:00
Hiroku 50a0f2d858 Merge branch 'armor_trims' into 'main'
Added Automaton armor trim

See merge request cable-mc/cobblemon!868
2024-02-10 01:37:25 +00:00
Hiroku 27210512f6 Oops 2024-02-10 01:25:08 +00:00
Hiroku 53aa124de6 Merge branch 'main' into 'armor_trims'
# Conflicts:
#   CHANGELOG.md
2024-02-10 01:24:45 +00:00
Apion a18b54849f Merge branch 'FetusAnimsUpdate' into 'main'
Many updates, asset changes, and refactors for the fossil machine

See merge request cable-mc/cobblemon!863
2024-02-10 01:24:04 +00:00
Hiroku c868c63a5f Merge branch 'whatsy/evo_stone_blocks' into 'main'
added nether fire stone ore

See merge request cable-mc/cobblemon!867
2024-02-10 01:23:41 +00:00
Lily 31df7c92f4 remove leftovers from trim materials 2024-02-09 20:00:36 -05:00
Hiroku 3b65d1967e Merge branch 'main' into 'whatsy/evo_stone_blocks'
# Conflicts:
#   CHANGELOG.md
2024-02-10 00:16:06 +00:00
Paul f30b15003f Remove lingering oceanic trim references 2024-02-10 10:05:10 +10:00
Hiroku c4c1b7ac27 Merge branch 'main' into 'armor_trims'
# Conflicts:
#   CHANGELOG.md
2024-02-09 23:56:54 +00:00
Paul ea9287cfb5 Fixed langs on interaction GUIs 2024-02-10 09:55:31 +10:00
Hiroku 02f845af5c Merge branch 'amo/sendout-upgrade' into 'main'
Added generic bedrock entity system, updated molang for fix, added test evo...

See merge request cable-mc/cobblemon!869
2024-02-09 23:11:04 +00:00
Paul 3bb3a00cef Renamed InteractionGUICreationEvent to PokemonInteractionGUICreationEvent 2024-02-10 08:28:31 +10:00
Paul f1ae4163c9 Cleaned up transition portion of PokemonRender#render and removed glow effect we don't want anymore 2024-02-10 08:27:31 +10:00
Paul 05957f2106 Renamed GenericBedrockModelRepository to GenericBedrockEntityModelRepository for clarity 2024-02-10 08:03:50 +10:00
Paul 4b9ea1d4cd Use an entity renderer for GenericBedrockEntities, obviously 2024-02-10 08:03:12 +10:00
Lily 78dff75db9 Update CHANGELOG.md 2024-02-09 16:46:56 -05:00
Lily dbab6404a1 Update CHANGELOG.md 2024-02-09 16:45:48 -05:00
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
Paul 317112f9bb Cleanup 2024-02-09 19:38:32 +10:00
Paul 58fda2e261 Changelog 2024-02-09 16:22:22 +10:00
Paul 3b442d387a licenses good, pipeline errors bad 2024-02-09 16:04:53 +10:00
Paul 2b575c888f Disable evo effect since it's not done yet 2024-02-09 14:15:58 +10:00
Paul 6e5e572412 Fixed some ball effects occurring even when snap-recalling before send out completes 2024-02-09 14:14:55 +10:00
Lily ce87d0dc48 Merge branch 'main' into whatsy/nether_fire_stone
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
2024-02-08 23:10:14 -05:00
Lily d43c91129c implemented nether fire stone ore 2024-02-08 23:02:26 -05:00
Lily d66b9c8d3b removed unused assets, oceanic pattern to be redone/possibly scrapped 2024-02-08 22:51:05 -05:00
JazzMcNade dc37b381a0 Review Changes: Refactored part of setStack into its own function 2024-02-07 21:17:56 -06:00
Lily 1206aaaf13 some updated textures 2024-02-07 21:13:12 -05:00
JazzMcNade 95bcb9a7b8 Most of the requested review changes 2024-02-06 23:28:15 -06:00