Commit Graph
4603 Commits
Author SHA1 Message Date
Hiroku 618453caaa Update CHANGELOG.md 2023-11-11 11:53:18 +00:00
Hiroku e1d048ec9d Merge branch 'main' into 'licious/190'
# Conflicts:
#   CHANGELOG.md
2023-11-11 11:52:37 +00:00
Hiroku 26ebd23d14 Merge branch 'sound' into 'main'
Added cries to the Beldum line, tweaked Pikachu and Raichu cries

See merge request cable-mc/cobblemon!766
2023-11-11 01:07:05 +00:00
Paul b446415200 Fixed minor position error in new pokeball animations 2023-11-11 09:45:47 +10:00
Sterrezo 17fed9662c Merge branch 'main' into sound 2023-11-10 21:38:28 +01:00
Sterrezo 74dd2a6c0d Added cries to the Beldum line, tweaked Pikachu and Raichu cries 2023-11-10 21:38:11 +01:00
Hiroku 5da5c72b4f Merge branch 'main' into 'main'
Restored Fabric BrewingStandBlockEntityMixin for brewing stand/sidehopper interaction

See merge request cable-mc/cobblemon!746
2023-11-10 05:55:58 +00:00
Hiroku 0604b45b9d Merge branch 'spectate' into 'main'
Added ability to spectate pokemon battles

See merge request cable-mc/cobblemon!747
2023-11-10 05:28:50 +00:00
Apion 132a43c5c7 Added ability to spectate pokemon battles 2023-11-10 05:28:50 +00:00
Hiroku b1e8f9cfb6 Merge branch 'fortune_evo_ores' into 'main'
Fortune evo ores

Closes #686

See merge request cable-mc/cobblemon!765
2023-11-10 04:21:57 +00:00
Lily a166a38c4b Update CHANGELOG.md 2023-11-09 22:59:52 -05:00
Lily 57fa6a58d5 Add Fortune compatibility to evo stone ores. Closes #686 2023-11-09 22:58:39 -05:00
Hiroku ad6fc97eef Merge branch 'implement_pokemon' into 'main'
One new Pokémon line, Animation, Textures, and Models updated. Pokémon Sleep? Naw just sleepy Pokemon.

See merge request cable-mc/cobblemon!763
2023-11-10 00:03:21 +00:00
Tyzillion fc39baaa30 Fixed Exeggcute faint, Added emissive to Hoothoot. 2023-11-09 18:40:59 -05:00
Tyzillion 887ff8ccdb Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2023-11-09 18:29:47 -05:00
Paul 4d6117f5bf Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2023-11-10 09:13:44 +10:00
Paul 3dc26639a5 Fixed Trevenant sleep animation 2023-11-10 09:13:28 +10:00
Tyzillion 252f9d5dbd Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
# Conflicts:
#	CHANGELOG.md
2023-11-09 16:46:47 -05:00
Nick 974f839d61 Merge branch 'more_composting' into 'main'
Update composting functionality for Heal Powder and mutated Herbs

Closes #681

See merge request cable-mc/cobblemon!759
2023-11-09 18:50:44 +00:00
Nick b4ea13ab20 Merge branch 'milk_the_mooshtank' into 'main'
Allow Mooshtanks to be milked for mushroom stew. Closes #684

Closes #684

See merge request cable-mc/cobblemon!758
2023-11-09 18:49:33 +00:00
Nick 06afb04050 Merge branch 'missing_messages' into 'main'
Added a bunch of missing texts. Fixes #582, #588

Closes #588 and #582

See merge request cable-mc/cobblemon!752
2023-11-09 18:48:25 +00:00
Lily 92c3d9464b Merge branch 'main' into milk_the_mooshtank
# Conflicts:
#	CHANGELOG.md
2023-11-09 13:04:53 -05:00
Lily 03ed8f3edd Update CHANGELOG.md 2023-11-09 13:03:23 -05:00
Hiroku b475b02fff Merge branch 'Bee-Related-Changes' into 'main'
Bee Related Changes

See merge request cable-mc/cobblemon!762
2023-11-08 20:10:18 +00:00
Charzard4261 8c462f1567 Gave the Pep-Up Flower item the "minecraft:flowers" tag, to allow Bees to be fed using them. 2023-11-08 16:23:16 +00:00
Lily e668735dd8 Update composting functionality for Heal Powder and mutated Herbs. Closes #681 2023-11-07 21:15:22 -05:00
Lily f0e65fe4de Allow Mooshtanks to be milked for mushroom stew. Closes #684 2023-11-07 20:41:19 -05:00
Tyzillion 3c11a673dc Update models for Hitmontop. Updated animations for Zubat, Golbat, Scatterbug, Spewpa. Added Shoulder animations for Zubat. 2023-11-07 07:23:36 -05:00
Tyzillion 8d38144551 Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon 2023-11-06 14:08:39 -05:00
JazzMcNade b44e5c797e Made sure mixin logic is applied for all potion slots in brewing stands. 2023-11-05 17:12:15 -06:00
JazzMcNade ae9337c84a Mixin compatibility changes. 2023-11-05 16:33:44 -06:00
JazzMcNade 5db2c4c955 Restored BrewingStandBlockEntityMixin for brewing stand/hopper interaction 2023-11-05 03:59:54 -06:00
Hiroku 8af1225c90 Merge branch 'npc-revival' into 'main'
Prevent NPCs from freezing battles upon using Revival Blessing.

See merge request cable-mc/cobblemon!745
2023-11-05 05:14:51 +00:00
jmmcp 4b181d75c8 Added a check to avoid NPCs freezing battles upon using Revival Blessing. 2023-11-05 00:51:38 -04:00
Hiroku 9e28dce3d7 Merge branch 'revival-blessing-fix' into 'main'
Fixes the move Revival Blessing

Closes #660

See merge request cable-mc/cobblemon!744
2023-11-05 02:29:27 +00:00
jmmcp 39f084bd56 Can't forget the changelog. 2023-11-04 21:46:29 -04:00
jmmcp c82bba7872 Add checks throughout the switch process to allow the Revival Blessing forceSwitch command to validate. 2023-11-04 21:42:03 -04:00
Hiroku 3f557d9ae6 Merge branch 'return_bottles' into 'main'
Return bottles

Closes #674 and #673

See merge request cable-mc/cobblemon!742
2023-11-04 04:35:26 +00:00
Tyzillion c15976a936 Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
# Conflicts:
#	CHANGELOG.md
2023-11-03 21:38:04 -04:00
Hiroku c8652b519a Merge branch 'vivillon_wings' into 'main'
Implement new Vivillon patterns

Closes #600 and #676

See merge request cable-mc/cobblemon!743
2023-11-04 00:51:32 +00:00
Lily 67c828dd0c missed one 2023-11-03 19:49:30 -04:00
Lily 10a1bc6bc6 Merge remote-tracking branch 'origin/return_bottles' into return_bottles 2023-11-03 19:42:35 -04:00
Lily e4db065a85 change friendshop drop through json and not the item class 2023-11-03 19:42:09 -04:00
Hiroku 171cd45e32 Merge branch 'main' into 'return_bottles'
# Conflicts:
#   CHANGELOG.md
2023-11-03 23:27:57 +00:00
Lily d638315fb1 Rename "Patterned Wings" to "Vivillonaire". Closes #676 2023-11-03 19:27:38 -04:00
Hiroku 980fa6a13d Merge branch 'healing_percent_fix' into 'main'
Fix issue involving health display after healing

Closes #663

See merge request cable-mc/cobblemon!740
2023-11-03 23:27:37 +00:00
Hiroku 267faf9397 Merge branch 'get-nerfed' into 'main'
Harder Healing Machine, Nerds

Closes #672

See merge request cable-mc/cobblemon!741
2023-11-03 23:25:56 +00:00
Lily 7549d77ad7 Update CHANGELOG.md 2023-11-03 19:24:59 -04:00
Lily 0f6929dd5e implement new vivillon wing patterns. Closes #600 2023-11-03 19:23:18 -04:00
Licious 79597a81fe Implemented conditional held item consumption. 2023-11-03 11:44:42 +00:00