 Yaseen
|
ea46a2973f
|
implement waterloggable pc
|
2023-06-15 22:16:26 +00:00 |
|
 Hiroku
|
26a9d8d07f
|
Merge branch 'ys/draw-triangles-fix' into 'main'
Fix for stats hexagon
See merge request cable-mc/cobblemon!497
|
2023-06-15 22:09:08 +00:00 |
|
|
Yaseen
|
71bba4296b
|
Fix for stats hexagon
|
2023-06-15 22:09:08 +00:00 |
|
 Licious
|
eb26ffa7ca
|
Fixed being locked out of healing machines if it goes boom during use.
|
2023-06-15 22:45:21 +01:00 |
|
|
Hiroku
|
57a7dccd37
|
Merge branch 'tooltip-changes' into 'main'
Tooltip changes
See merge request cable-mc/cobblemon!494
|
2023-06-15 21:19:22 +00:00 |
|
 Licious
|
5fa56177fc
|
Tooltip changes
|
2023-06-15 21:19:22 +00:00 |
|
|
Hiroku
|
d68d630175
|
Merge branch 'french-toast-is-better' into 'main'
Implement toast API
Closes #288
See merge request cable-mc/cobblemon!489
|
2023-06-15 10:06:04 +00:00 |
|
|
Licious
|
662ae77944
|
Implement toast API
|
2023-06-15 10:06:04 +00:00 |
|
 Nick
|
469fb8dd52
|
Merge branch 'loot-table-appending' into 'main'
Implemented LootTable injection
Closes #217
See merge request cable-mc/cobblemon!490
|
2023-06-13 17:21:40 +00:00 |
|
|
Licious
|
371f2ac08a
|
Implemented LootTable injection
|
2023-06-13 17:21:39 +00:00 |
|
|
Hiroku
|
54c591b51f
|
Merge branch 'maven-deployment' into 'main'
Add new maven deployment job
See merge request cable-mc/cobblemon!488
|
2023-06-07 07:57:55 +00:00 |
|
|
Paul
|
620ef585ce
|
Changelog for trading completed. Closes #92
|
2023-06-07 17:56:07 +10:00 |
|
|
Paul
|
9601cf49ce
|
Merge remote-tracking branch 'origin/main' into trading
|
2023-06-07 17:55:13 +10:00 |
|
|
Paul
|
56088e3a40
|
Make Nick happy
|
2023-06-07 17:52:56 +10:00 |
|
|
Nick
|
5b8149ce82
|
Add new maven deployment job
|
2023-06-06 21:02:46 -07:00 |
|
|
Hiroku
|
332981a198
|
Update CHANGELOG.md [skip-ci]
|
2023-06-04 22:49:31 +00:00 |
|
|
Hiroku
|
5c026d7494
|
Merge branch 'add-persistent-data-to-pokemon' into 'main'
add Pokemon Persistent Data
See merge request cable-mc/cobblemon!484
|
2023-06-04 22:47:59 +00:00 |
|
|
Hiroku
|
bb7342cd2d
|
Merge branch 'added-sounds' into 'main'
Added cries for Braixen, Chatot, Chespin, Conkeldurr, Darmanitan, Darumaka,...
See merge request cable-mc/cobblemon!486
|
2023-06-04 22:42:40 +00:00 |
|
 Sterrezo
|
90d1797cb4
|
Added cries for Braixen, Chatot, Chespin, Conkeldurr, Darmanitan, Darumaka,...
|
2023-06-04 22:42:40 +00:00 |
|
|
Paul
|
04cb83b13e
|
Tint the trade and battle challenge icons if a request exists
|
2023-06-03 11:04:43 +10:00 |
|
|
Paul
|
d8a5ffa567
|
Fixed langs being broken in many cases (anything with 'pokemon' in the key
|
2023-06-03 11:04:17 +10:00 |
|
|
Paul
|
07cfd61ebe
|
Removed debug sound
|
2023-06-02 14:02:25 +10:00 |
|
|
Paul
|
a7fe48ec20
|
Show EVs on trade GUI, fixed models display glitching on resize
|
2023-06-02 14:00:26 +10:00 |
|
 Oliver Whitehead
|
1c1cb3e91f
|
add Pokemon Persistent Data
|
2023-06-02 01:27:22 +01:00 |
|
|
Paul
|
bfb14ff828
|
Allow multiple trades per active trade
|
2023-06-02 10:02:52 +10:00 |
|
|
Paul
|
c7ff0c7e39
|
More fixes and implementations of lang for trading
|
2023-05-31 23:07:45 +10:00 |
|
|
Paul
|
3f4d2c7f8c
|
Implement opposite party data in trade GUI
|
2023-05-30 19:53:48 +10:00 |
|
 Village
|
aa31776bf3
|
prevent modification of display name MutableText, nudge gender icon to prevent overlap
|
2023-05-29 21:22:53 -04:00 |
|
|
Paul
|
f75c0aeab4
|
Merge remote-tracking branch 'origin/main' into trading
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleRegistry.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/keybind/keybinds/PartySendBinding.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/item/PokemonItemRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/PokemonItem.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
|
2023-05-29 18:35:11 +10:00 |
|
|
Village
|
952ad6e0d2
|
trade
|
2023-05-29 03:36:41 -04:00 |
|
|
Village
|
2a41f431bb
|
trade
|
2023-05-28 23:38:27 -04:00 |
|
|
Paul
|
721823117a
|
Added trader party to trade GUI initializer
|
2023-05-28 07:00:28 +10:00 |
|
|
Hiroku
|
2387639cea
|
See above
|
2023-05-23 21:59:12 +00:00 |
|
|
Hiroku
|
83fdcceaa7
|
You saw nothing
|
2023-05-23 21:57:48 +00:00 |
|
|
Hiroku
|
8db77bcaea
|
Say stats instead of nature with mints
|
2023-05-23 21:53:15 +00:00 |
|
|
Paul
|
1c942ce83c
|
Move version number up to 1.4.0
|
2023-05-17 20:44:06 +10:00 |
|
|
Paul
|
2d3ff73530
|
Merge remote-tracking branch 'origin/main'
|
2023-05-17 20:40:09 +10:00 |
|
|
Paul
|
4d5bc93702
|
Fixed Forge runs
|
2023-05-17 20:39:22 +10:00 |
|
|
Hiroku
|
cdf41a5b13
|
Merge branch '1.19.3-particle-camera-modes' into 'main'
1.19.3 particle camera modes
See merge request cable-mc/cobblemon!479
|
2023-05-15 20:57:09 +00:00 |
|
|
Hiroku
|
9651025bef
|
1.19.3 particle camera modes
|
2023-05-15 20:57:08 +00:00 |
|
|
Paul
|
54a9412a5c
|
Moved spawn frequency to config option. Closes #260
|
2023-05-15 18:32:08 +10:00 |
|
|
Paul
|
4bfeda2031
|
Substantially reduced default frequency of Pokémon cries (default is now once in 54 seconds). Closes #265
|
2023-05-15 18:25:18 +10:00 |
|
|
Paul
|
ed136ecabb
|
Fixed invalid action choices from AI causing crashes. Closes #284
|
2023-05-15 18:05:46 +10:00 |
|
|
Paul
|
2f0eb7c246
|
Fixed logging spam when loading shoulder mounted Pokémon on the client. Closes #289
|
2023-05-15 18:01:46 +10:00 |
|
|
Hiroku
|
ea0c16bf01
|
Merge branch '#279-heal-wild-pokemon' into 'main'
HealWildOnDefeatOrRun
See merge request cable-mc/cobblemon!476
|
2023-05-14 00:04:30 +00:00 |
|
 Islana
|
18d6917e9f
|
HealWildOnDefeatOrRun
|
2023-05-14 00:04:30 +00:00 |
|
|
Paul
|
039c5993f5
|
Sprite/block texture updates, fix deepslate water stone ore looking like deepslate fire stone ore
|
2023-05-14 09:09:56 +10:00 |
|
|
Hiroku
|
8394d9f0f0
|
Merge branch 'bad-world-squeezewithinbounds' into 'main'
Fixed World.squeezeWithinBounds squeezing z coordinates using border's x coordinates
See merge request cable-mc/cobblemon!478
|
2023-05-13 11:46:17 +00:00 |
|
 David Sadler
|
1b791abbe0
|
Fixed World.squeezeWithinBounds squeezing z coordinates using border's x coordinates
|
2023-05-13 12:37:00 +01:00 |
|
|
Hiroku
|
ed07a915dc
|
Merge branch '273-pokemon-spawn-outside-world-border' into 'main'
Fixed pokemon spawning outside world border
Closes #273
See merge request cable-mc/cobblemon!477
|
2023-05-13 10:28:27 +00:00 |
|