Hiroku
|
f00a569d9d
|
Merge branch 'main' into 'augh-u-rite'
# Conflicts:
# CHANGELOG.md
|
2023-11-12 02:40:29 +00:00 |
|
Hiroku
|
aaa5484752
|
Update CHANGELOG.md [skip-ci]
|
2023-11-12 01:38:44 +00:00 |
|
Hiroku
|
c6e82ebfb9
|
Merge branch 'fix-405-recall-visual-bug' into 'main'
Fix visual Pokemon recall bug
Closes #415 and #405
See merge request cable-mc/cobblemon!750
|
2023-11-12 01:37:19 +00:00 |
|
Hiroku
|
365844ae2e
|
Merge branch 'battle_text_fail_block' into 'main'
Added -fail and -block handlers to ShowdownInterpreter as well as added around...
See merge request cable-mc/cobblemon!753
|
2023-11-12 01:33:22 +00:00 |
|
Hiroku
|
c18c1f39fb
|
Merge branch 'main' into 'battle_text_fail_block'
# Conflicts:
# CHANGELOG.md
|
2023-11-12 01:09:42 +00:00 |
|
Hiroku
|
1fd2aa06ae
|
Merge branch 'EXP-Item-Pokemon-Select' into 'main'
Exp Candies - Party Pokemon Select
Closes #692
See merge request cable-mc/cobblemon!757
|
2023-11-11 22:55:31 +00:00 |
|
Hiroku
|
931852bd36
|
Merge branch 'alolanRatataFix' into 'main'
Fixed alolan Rattata animations
Closes #695
See merge request cable-mc/cobblemon!768
|
2023-11-11 19:48:25 +00:00 |
|
Waldleufer
|
272f429f59
|
Fixed alolan Rattata animations
|
2023-11-11 19:48:24 +00:00 |
|
Hiroku
|
6a5c6d2b17
|
Merge branch 'licious/190' into 'main'
Conditional held item consumption
Closes #190
See merge request cable-mc/cobblemon!767
|
2023-11-11 12:37:16 +00:00 |
|
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 |
|
jeffw773
|
ed8fe19dc1
|
Fixed redundancies, added shared langs for a few moves, and fixed red formatting for fail lang.
|
2023-11-10 15:30:11 -08:00 |
|
dhi_holo
|
e674b042d0
|
Nerfed Obsidian
reduced crafting to output 1 because it makes more sense
|
2023-11-11 08:49:21 +10:00 |
|
dhi_holo
|
53abb58ae6
|
Merge branch 'main' into augh-u-rite
|
2023-11-11 08:47:01 +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 |
|
Stephen White
|
7505ce15e3
|
Merge remote-tracking branch 'upstream/main' into fix-405-recall-visual-bug
|
2023-11-10 12:27:43 -04:00 |
|
Charzard4261
|
30ba97ea69
|
Merge remote-tracking branch 'origin/EXP-Item-Pokemon-Select' into EXP-Item-Pokemon-Select
|
2023-11-10 14:15:20 +00:00 |
|
Charzard4261
|
5fee2df9f7
|
Added a missing POKEMON_INTERACT trigger in PokemonSelectingItem, when successfully using an Item on a Pokemon out of battle.
|
2023-11-10 14:14:53 +00:00 |
|
Charzard4261
|
238c7474b3
|
Merge branch 'main' into 'EXP-Item-Pokemon-Select'
# Conflicts:
# CHANGELOG.md
|
2023-11-10 11:14:39 +00: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 |
|
Charzard4261
|
95006ae327
|
Merge branch 'main' into 'EXP-Item-Pokemon-Select'
# Conflicts:
# CHANGELOG.md
|
2023-11-10 00:08:03 +00: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 |
|
Charzard4261
|
599b8c5eec
|
Merge branch 'main' into 'EXP-Item-Pokemon-Select'
# Conflicts:
# CHANGELOG.md
|
2023-11-09 18:55:55 +00: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 |
|
Charzard4261
|
084a7bfb3c
|
CandyItem now uses PokemonSelectingItem, and does not consume when in Creative.
|
2023-11-08 00:46:51 +00: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 |
|
dhi_holo
|
deb2cff477
|
A Use?
Augurite now can make axes and obsidian, closes #687
|
2023-11-07 12:16:30 +10:00 |
|
jeffw773
|
79d89852d4
|
Added -fail and -block handlers to ShowdownInterpreter as well as added around 17 battle texts related to them
|
2023-11-06 15:51:09 -08:00 |
|
Tyzillion
|
8d38144551
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
|
2023-11-06 14:08:39 -05:00 |
|