Merge branch 'main' into 'main'

Fixes brushing for neoforge

Closes #1939

See merge request cable-mc/cobblemon!2154
This commit is contained in:
Polymeta
2026-02-26 15:43:03 +00:00
107 changed files with 107 additions and 106 deletions
+1
View File
@@ -30,6 +30,7 @@
- Fixed issue where particle like beam can disappear when you don't see the beginning of the beam or you look away
- Fixes https://gitlab.com/cable-mc/cobblemon/-/issues/1943
- Fix occasional crash on retrieving revived fossils
- Fix brushing not working on Neoforge
- [Various Submarine Ride Fixes](https://gitlab.com/cable-mc/cobblemon/-/merge_requests/2157)
- Fix Pastured mons despawning and running away.
- Fix Apricorn trees crashing when other mods bonemeal it
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [
@@ -12,7 +12,7 @@
"requirements": [
{
"variant": "owner_held_item",
"itemCondition": "#c:tools/brushes"
"itemCondition": "#c:tools/brush"
}
],
"effects": [

Some files were not shown because too many files have changed in this diff Show More