Merge branch '1.18.2' into 1.20.x

Pokecube-Development · Oct 15, 2023 · 35daed4 · 35daed4
2 parents adea306 + 7e7dc30
commit 35daed4
Show file tree

Hide file tree

Showing 435 changed files with 1,946 additions and 179 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,9 +14,9 @@ channel_mappings=official
 version_thutcore=99
 
 version_major=3
-version_minor=23
+version_minor=24
 
-pre_release=false
+pre_release=true
 pre_ver=0.a
 
 compile_name=pokecube-aio

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/aipom.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/aipom.json
@@ -130,6 +130,7 @@
       "sand-attack",
       "headbutt",
       "body-slam",
+      "take-down",
       "double-edge",
       "tail-whip",
       "low-kick",
@@ -184,6 +185,7 @@
       "facade",
       "focus-punch",
       "taunt",
+      "helping-hand",
       "role-play",
       "revenge",
       "brick-break",
@@ -194,6 +196,7 @@
       "tickle",
       "aerial-ace",
       "bounce",
+      "mud-shot",
       "covet",
       "shock-wave",
       "water-pulse",
@@ -211,6 +214,7 @@
       "grass-knot",
       "double-hit",
       "hone-claws",
+      "smack-down",
       "low-sweep",
       "foul-play",
       "round",
@@ -220,7 +224,10 @@
       "work-up",
       "tail-slap",
       "confide",
-      "power-up-punch"
+      "power-up-punch",
+      "tera-blast",
+      "trailblaze",
+      "chilling-water"
     ]
   },
   "loot_table": "pokecube:entities/rabbit_1"

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/alomomola.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/alomomola.json
@@ -191,6 +191,8 @@
       "play-nice",
       "confide",
       "liquidation",
+      "scale-shot",
+      "flip-turn",
       "tera-blast",
       "snowscape",
       "chilling-water"

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/altaria.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/altaria.json
@@ -155,6 +155,7 @@
       "agility",
       "mimic",
       "double-team",
+      "haze",
       "fire-blast",
       "swift",
       "dream-eater",
@@ -194,6 +195,7 @@
       "secret-power",
       "hyper-voice",
       "astonish",
+      "weather-ball",
       "air-cutter",
       "aerial-ace",
       "dragon-claw",

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/ambipom.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/ambipom.json
@@ -114,11 +114,14 @@
       "thunder-punch",
       "scratch",
       "cut",
+      "slam",
       "sand-attack",
       "headbutt",
+      "take-down",
       "tail-whip",
       "hyper-beam",
       "low-kick",
+      "counter",
       "strength",
       "solar-beam",
       "thunderbolt",
@@ -129,6 +132,7 @@
       "agility",
       "screech",
       "double-team",
+      "metronome",
       "swift",
       "dream-eater",
       "fury-swipes",
@@ -153,10 +157,13 @@
       "sunny-day",
       "shadow-ball",
       "rock-smash",
+      "beat-up",
+      "fake-out",
       "uproar",
       "facade",
       "focus-punch",
       "taunt",
+      "helping-hand",
       "role-play",
       "brick-break",
       "knock-off",
@@ -166,6 +173,7 @@
       "tickle",
       "aerial-ace",
       "bounce",
+      "mud-shot",
       "covet",
       "shock-wave",
       "water-pulse",
@@ -175,6 +183,7 @@
       "fling",
       "last-resort",
       "seed-bomb",
+      "switcheroo",
       "giga-impact",
       "nasty-plot",
       "shadow-claw",
@@ -183,16 +192,21 @@
       "grass-knot",
       "double-hit",
       "hone-claws",
+      "smack-down",
       "low-sweep",
       "foul-play",
       "round",
+      "quick-guard",
       "acrobatics",
       "retaliate",
       "work-up",
       "dual-chop",
       "confide",
       "power-up-punch",
-      "laser-focus"
+      "laser-focus",
+      "tera-blast",
+      "trailblaze",
+      "chilling-water"
     ]
   },
   "interactions": [

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/ampharos.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/ampharos.json
@@ -138,6 +138,7 @@
       "take-down",
       "double-edge",
       "growl",
+      "roar",
       "hyper-beam",
       "low-kick",
       "counter",

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/annihilape.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/annihilape.json
@@ -153,6 +153,7 @@
       "substitute",
       "thief",
       "reversal",
+      "spite",
       "protect",
       "scary-face",
       "outrage",
@@ -162,7 +163,9 @@
       "rain-dance",
       "sunny-day",
       "shadow-ball",
+      "uproar",
       "facade",
+      "focus-punch",
       "taunt",
       "helping-hand",
       "brick-break",
@@ -174,17 +177,20 @@
       "poison-jab",
       "seed-bomb",
       "drain-punch",
+      "vacuum-wave",
       "focus-blast",
       "giga-impact",
       "shadow-claw",
       "gunk-shot",
       "stone-edge",
       "stealth-rock",
+      "smack-down",
       "low-sweep",
       "acrobatics",
       "bulldoze",
       "phantom-force",
-      "stomping-tantrum"
+      "stomping-tantrum",
+      "lash-out"
     ]
   }
 }
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arbok.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arbok.json
@@ -171,6 +171,7 @@
       "bide",
       "skull-bash",
       "glare",
+      "leech-life",
       "rest",
       "rock-slide",
       "substitute",
@@ -179,7 +180,9 @@
       "curse",
       "spite",
       "protect",
+      "scary-face",
       "sludge-bomb",
+      "mud-slap",
       "giga-drain",
       "endure",
       "swagger",
@@ -197,16 +200,23 @@
       "swallow",
       "torment",
       "facade",
+      "knock-off",
       "snatch",
       "secret-power",
+      "poison-fang",
       "rock-tomb",
+      "mud-shot",
+      "poison-tail",
       "natural-gift",
       "payback",
       "gastro-acid",
+      "sucker-punch",
+      "toxic-spikes",
       "poison-jab",
       "dark-pulse",
       "aqua-tail",
       "seed-bomb",
+      "switcheroo",
       "giga-impact",
       "thunder-fang",
       "ice-fang",
@@ -221,12 +231,18 @@
       "round",
       "bulldoze",
       "dragon-tail",
+      "snarl",
       "belch",
       "confide",
       "infestation",
       "throat-chop",
       "brutal-swing",
-      "stomping-tantrum"
+      "psychic-fangs",
+      "stomping-tantrum",
+      "scale-shot",
+      "lash-out",
+      "tera-blast",
+      "trailblaze"
     ]
   },
   "loot_table": "pokecube:entities/leather"

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arboliva.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arboliva.json
@@ -144,6 +144,7 @@
       "facade",
       "helping-hand",
       "hyper-voice",
+      "weather-ball",
       "bullet-seed",
       "magical-leaf",
       "fling",
@@ -155,6 +156,7 @@
       "grass-knot",
       "grassy-terrain",
       "dazzling-gleam",
+      "solar-blade",
       "pollen-puff",
       "tera-blast",
       "trailblaze"

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arcanine.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arcanine.json
@@ -157,6 +157,7 @@
       "retaliate",
       "bulldoze",
       "wild-charge",
+      "heat-crash",
       "snarl",
       "play-rough",
       "confide",

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arctibax.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arctibax.json
@@ -121,6 +121,7 @@
       "helping-hand",
       "brick-break",
       "aerial-ace",
+      "icicle-spear",
       "dragon-claw",
       "dragon-pulse",
       "avalanche",

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/ariados.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/ariados.json
@@ -155,6 +155,7 @@
       "double-edge",
       "poison-sting",
       "pin-missile",
+      "disable",
       "hyper-beam",
       "absorb",
       "solar-beam",
@@ -177,6 +178,7 @@
       "spider-web",
       "snore",
       "curse",
+      "spite",
       "protect",
       "scary-face",
       "sludge-bomb",
@@ -187,15 +189,20 @@
       "sleep-talk",
       "return",
       "frustration",
+      "megahorn",
+      "baton-pass",
       "hidden-power",
       "sunny-day",
       "facade",
+      "knock-off",
       "secret-power",
       "signal-beam",
       "bounce",
       "natural-gift",
       "sucker-punch",
+      "toxic-spikes",
       "poison-jab",
+      "night-slash",
       "x-scissor",
       "bug-buzz",
       "giga-impact",
@@ -205,8 +212,11 @@
       "bug-bite",
       "hone-claws",
       "venoshock",
+      "rage-powder",
+      "acid-spray",
       "foul-play",
       "round",
+      "hex",
       "struggle-bug",
       "electroweb",
       "sticky-web",
@@ -216,8 +226,12 @@
       "infestation",
       "toxic-thread",
       "throat-chop",
+      "lunge",
       "smart-strike",
-      "stomping-tantrum"
+      "stomping-tantrum",
+      "tera-blast",
+      "pounce",
+      "trailblaze"
     ]
   },
   "loot_table": "minecraft:entities/spider"

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/armarouge.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/armarouge.json
@@ -140,6 +140,7 @@
       "fire-blast",
       "rest",
       "substitute",
+      "spite",
       "protect",
       "endure",
       "sleep-talk",
@@ -151,6 +152,7 @@
       "taunt",
       "helping-hand",
       "trick",
+      "weather-ball",
       "overheat",
       "iron-defense",
       "calm-mind",

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arrokuda.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/arrokuda.json
@@ -138,6 +138,7 @@
       "psychic-fangs",
       "liquidation",
       "scale-shot",
+      "flip-turn",
       "tera-blast",
       "chilling-water"
     ]

diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/articuno.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/articuno.json
@@ -178,6 +178,7 @@
       "mimic",
       "double-team",
       "light-screen",
+      "haze",
       "reflect",
       "bide",
       "swift",