Hiroku
|
2f1f33f802
|
Fix dragon fang recipe
|
2023-03-13 11:58:40 +00:00 |
|
Hiroku
|
51f6cf1ed3
|
Merge branch 'recipe-sprint' into 'main'
Held Item Recipes
See merge request cable-mc/cobblemon!352
|
2023-03-12 06:15:09 +00:00 |
|
dhi_holo
|
e487dd2cde
|
Held Item Recipes
|
2023-03-12 06:15:09 +00:00 |
|
Paul
|
bfef29b11a
|
Added Razor Fang
|
2023-03-12 12:36:19 +10:00 |
|
Paul
|
e22bcd9fb3
|
Fixed model items not rendering layers
|
2023-03-12 12:19:34 +10:00 |
|
Paul
|
167b70d237
|
Added tooltip to healing machine
|
2023-03-12 11:14:23 +10:00 |
|
Landon
|
90f446455f
|
Fix socket showdown for changes in MR 353
|
2023-03-11 23:23:30 +00:00 |
|
Deltric
|
ef10c62114
|
Added player extensions for PC and extra data
|
2023-03-11 22:53:44 +00:00 |
|
Licious
|
2fae30206c
|
Showdown species fixes
|
2023-03-11 13:11:01 +00:00 |
|
Paul
|
ea3a1f16f3
|
Fixed apple eating mixin on Forge
|
2023-03-11 18:51:46 +10:00 |
|
Paul
|
20b6f44e63
|
Updated Showdown version
|
2023-03-11 17:53:04 +10:00 |
|
Paul
|
d61656afe9
|
Licenses
|
2023-03-11 14:13:12 +10:00 |
|
Paul
|
cc69f04afa
|
Merge remote-tracking branch 'origin/main'
|
2023-03-11 14:10:19 +10:00 |
|
Paul
|
397e9a2b5f
|
Added leftovers from eating apples
|
2023-03-11 14:09:25 +10:00 |
|
JMMCP
|
33cfe3b981
|
Added Razor Claw item.
|
2023-03-11 03:49:48 +00:00 |
|
Hiroku
|
391283a604
|
Merge branch 'Fixed-incorrect-luxury-ball-recipe' into 'main'
Fixed incorrect Luxury Ball crafting recipe.
See merge request cable-mc/cobblemon!350
|
2023-03-11 02:26:42 +00:00 |
|
JMMCP
|
a56f313957
|
Fixed incorrect Luxury Ball crafting recipe.
|
2023-03-11 02:26:42 +00:00 |
|
Paul
|
93261ada2b
|
Fixed move names not being translated in battle messages
|
2023-03-11 12:20:16 +10:00 |
|
JMMCP
|
73751c083d
|
Added ShowdownInterpreter support for activation of Leftovers and Quick Claw held items.
|
2023-03-11 02:03:38 +00:00 |
|
Hiroku
|
f9aa09c654
|
Merge branch 'walking-leaves' into 'main'
Add Walking Wake and Iron Leaves
See merge request cable-mc/cobblemon!334
|
2023-03-11 01:23:54 +00:00 |
|
Licious
|
1e92ac4603
|
Add Walking Wake and Iron Leaves
|
2023-03-11 01:23:54 +00:00 |
|
Paul
|
fb1c1170b3
|
Corrected mistaken spaces in some lang entries
|
2023-03-10 23:00:30 +10:00 |
|
Hiroku
|
1e33b4fc1d
|
Kotlin4forge compat
|
2023-03-10 12:15:32 +00:00 |
|
Paul
|
07b182f044
|
Fixed capture calculator bugs
|
2023-03-10 21:30:39 +10:00 |
|
Paul
|
d3e51c9211
|
Added remapping from charcoal stick to charcoal for Showdown
|
2023-03-10 20:21:15 +10:00 |
|
Paul
|
6dbaba2895
|
Removed auspicious armour from is_held_item tag since item was removed
|
2023-03-10 19:40:34 +10:00 |
|
jmmcp
|
036f1af99f
|
Added held items Leftovers, Light Clay, Magnet, Miracle Seed, Mystic Water, Never-Melt Ice, Poison Barb, Quick Claw, Sharp Beak, Silver Powder, Soft Sand, Spell Tag, and Twisted Spoon.
Updated item sprites for Muscle Band, Safety Goggles, and Wise Glasses.
Changed Charcoal to Charcoal Stick.
|
2023-03-10 00:59:02 -05:00 |
|
Hiroku
|
c3592183fb
|
Merge branch '#145-pokemon-damage-changes' into 'main'
Pokemon invulnerability adjustments
See merge request cable-mc/cobblemon!346
|
2023-03-10 02:16:19 +00:00 |
|
Deltric
|
bf322930e7
|
Pokemon invulnerability adjustments
|
2023-03-10 02:16:19 +00:00 |
|
Paul
|
9a9885adef
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# CHANGELOG.md
|
2023-03-10 11:46:05 +10:00 |
|
Paul
|
0e22e56ca8
|
Added block tag support for neededBaseBlocks
|
2023-03-10 11:45:24 +10:00 |
|
Hiroku
|
0d9b639247
|
Merge branch 'apricorn-event' into 'main'
Apricorn harvest event
See merge request cable-mc/cobblemon!345
|
2023-03-10 01:44:45 +00:00 |
|
Deltric
|
c59733b8ae
|
Apricorn harvest event
|
2023-03-10 01:44:45 +00:00 |
|
Hiroku
|
c3f28b01f9
|
Merge branch 'summary-screen-cleanup' into 'main'
Summary screen safety and clean up
See merge request cable-mc/cobblemon!344
|
2023-03-10 01:25:37 +00:00 |
|
Licious
|
7707530b2f
|
Summary screen safety and clean up
|
2023-03-10 01:25:37 +00:00 |
|
Deltric
|
fc3c01aac6
|
Config option to disable pokemon player damage
|
2023-03-10 01:24:53 +00:00 |
|
Licious
|
2f0f9e9f9a
|
Add/change various evolution items
|
2023-03-07 21:15:17 +00:00 |
|
Hiroku
|
c3201effc7
|
Merge branch 'nametag-disabling' into 'main'
Handle name tags in the context of the mod
See merge request cable-mc/cobblemon!341
|
2023-03-07 11:44:56 +00:00 |
|
Licious
|
c11074b828
|
Handle name tags in the context of the mod
|
2023-03-07 11:44:55 +00:00 |
|
Hiroku
|
1eda4884b3
|
Merge branch 'milk' into 'main'
milk
See merge request cable-mc/cobblemon!342
|
2023-03-07 09:03:44 +00:00 |
|
Village
|
52ead1d48a
|
milk
|
2023-03-06 20:22:57 -05:00 |
|
Paul
|
8eabd03a2b
|
Fixed more instances of capture calculator not doing the division correctly
|
2023-03-06 17:31:10 +10:00 |
|
Paul
|
5a6671e988
|
Merge branch 'main' into milky-capture-calculator
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt
|
2023-03-06 17:25:54 +10:00 |
|
Paul
|
ae6def9d5f
|
A bunch of fixes to capture calculation, use gen9 but with difficulty scaler and halving of catch when outside of battle
|
2023-03-06 17:25:18 +10:00 |
|
Paul
|
cadb313ff8
|
Wooloo and Dubwool eat animations, fixed some pokemon sleeping on beds when they shouldn't, shadow size tweak
|
2023-03-06 12:50:17 +10:00 |
|
Paul
|
2826bea987
|
Swapped recall and send out beam colours again
|
2023-03-05 12:15:36 +10:00 |
|
Hiroku
|
e6b3b6fae1
|
Misc fixes
|
2023-03-04 09:07:57 +00:00 |
|
Paul
|
06c5eae339
|
Merge remote-tracking branch 'origin/main'
|
2023-03-04 17:05:28 +10:00 |
|
Tyzillion
|
b2e56130cf
|
Framings fixed, emissives added, and model tweaks.
|
2023-03-04 07:04:28 +00:00 |
|
Paul
|
6ce1288506
|
Improve safe-positioning of spawning Pokémon
|
2023-03-04 16:41:31 +10:00 |
|