Lily
|
dbc074bfde
|
Update protected message to show on action bar
|
2023-11-09 23:47:04 -05:00 |
|
Lily
|
17cdedf65f
|
Rename ResurrectionMachineMultiblockBuilder to FossilMultiblockBuilder for consistency
|
2023-11-09 23:46:28 -05:00 |
|
Lily
|
701af6cd8f
|
Fix conflicting imports
|
2023-11-09 23:14:45 -05:00 |
|
Lily
|
41a0dce7fc
|
Merge remote-tracking branch 'origin/main' into archaeology
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlockEntities.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
|
2023-11-09 23:07:30 -05:00 |
|
Lily
|
3b122b7bcc
|
Add fossils to the creative inventory
|
2023-11-09 22:36:39 -05:00 |
|
Lily
|
2b3500dfc3
|
Add a sound for retrieving a fossil from the fossil machine
|
2023-11-09 22:05:32 -05:00 |
|
Lily
|
e921253a57
|
Added the missing fossil jsons
|
2023-11-09 21:53:05 -05:00 |
|
Lily
|
da45797022
|
Added a 5-minute protection period where only the player who input the fossil can claim the resulting Pokemon
|
2023-11-09 21:34:46 -05:00 |
|
Lily
|
fc1f68711d
|
Added more sounds to the fossil machine, and added a visual when done growing
|
2023-11-09 20:57:29 -05:00 |
|
Lily
|
da9c1f440c
|
Added sounds to the fossil machine
|
2023-11-09 19:48:26 -05: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 |
|
Lily
|
80d2f76dfc
|
Merge remote-tracking branch 'origin/archaeology' into archaeology
|
2023-11-09 17:38:20 -05:00 |
|
Lily
|
ebf3c9b82f
|
Changed NaturalMaterial into a data class. Added a returnItem parameter for returning leftovers after using an item as fuel (e.g. a bowl when using mushroom stew)
|
2023-11-09 17:38:05 -05:00 |
|
Lily
|
af57ac45a2
|
Added list of cobblemon items that can be used as fuel for the fossil machine. Also moved mint seeds to their own tag.
|
2023-11-09 17:35:37 -05: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 |
|
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 |
|
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
|
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 |
|
Lily
|
0f6929dd5e
|
implement new vivillon wing patterns. Closes #600
|
2023-11-03 19:23:18 -04:00 |
|
dhi_holo
|
e54e822c3a
|
Harder Healing Machine, Nerds
Closes #672
|
2023-11-03 15:12:30 +10:00 |
|
Lily
|
5e60bb525c
|
Changes to healing items. Closes #673, #674
|
2023-11-02 23:47:12 -04:00 |
|
Tyzillion
|
c49cb45892
|
Fixed sleeping animations not playing for many Pokmeon. Implemented Litwick line, Update model, texture, and animations for Zubat line. Fixed Ceruledge back spike texture error. Updated Dusknoir, Ratatta, and Exegguter animation. Fixed Volbeat t-pose when flying. Fixed Wimpod asymmetric eyebrows. Fixed Voltorb texture. Fixed shiny Pidgeotto texture.
|
2023-11-02 22:22:16 -04:00 |
|
Tyzillion
|
e0a896377e
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
|
2023-11-02 22:19:43 -04:00 |
|
Lily
|
b96638226c
|
Fixes #663
|
2023-11-02 22:19:36 -04:00 |
|
Lily
|
7c025582e0
|
Added a bunch of missing texts. Fixes #582, #588
|
2023-11-02 19:59:52 -04:00 |
|
Licious
|
d6a991e81e
|
Fix various potion related issues.
|
2023-11-02 22:43:33 +00:00 |
|
Tyzillion
|
5d5de4f2f3
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
# Conflicts:
# CHANGELOG.md
|
2023-11-02 15:38:50 -04: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 |
|