Merge remote-tracking branch 'origin/1.19.2-develop' into 1.19.2-develop

docs/CREDITS.txt

@@ -42,6 +42,7 @@ GizmoTheMoonPig
 - Implementation of Jade compatibility.
 - Implementation of Lootr compatibility.
 - Implementation of Randomium compatibility.
+- Implementation of Tips compatibility.
 - Fixes to Netherite Gloves being uncraftable with 1.20 datapack.
 - Fixes to the Life Shard silver heart overlay rendering.
 - Fixes to aether1 and aether2 music naming.
@@ -62,6 +63,9 @@ Jonathing
 - Fixes to Jade compatibility with boss bars.
 - Cleanup of mixin and event code relating to Valkyrie Tools' reach.
 
+KaiAF
+- Fixes to Optifine incompatibility.
+
 Kelvin285
 - Implementation of the world preview feature for the Aether's main menu.
 

docs/README.md

@@ -137,6 +137,7 @@ The Aether is available in these languages thanks to the following contributors:
 | Romanian                    | (ro_ro) | lucatatar321, gigelciobanu205                                                                              |
 | Russian                     | (ru_ru) | LeyxorCheysen, andreyalex1236, LunarP1, zombi1944, Foxgreat, lonespeaker, davekart0n, paskanius            |
 | Slovak                      | (sk_sk) | GaucovyAero                                                                                                |
+| Spanish                     | (es_es) | cabaneter                                                                                                  |
 | Swedish                     | (sv_se) | magicus, 2lay                                                                                              |
 | Thai                        | (th_th) | txwfyxa                                                                                                    |
 | Toki Pona                   | (tok)   | leko soko Wijapipapa                                                                                       |

src/generated/resources/assets/aether/lang/en_us.json

@@ -444,17 +444,27 @@
   "gui.aether.moa_skins.pack.lifetime_valkyrie_moa_skins": "Lifetime Valkyrie Moa Skins",
   "gui.aether.moa_skins.pack.natural_moa_skins": "Natural Moa Skins",
   "gui.aether.moa_skins.skin.arctic_moa": "Arctic Moa",
+  "gui.aether.moa_skins.skin.battle_sentry_moa": "Battle Sentry Moa",
   "gui.aether.moa_skins.skin.black_moa": "Black Moa",
   "gui.aether.moa_skins.skin.blue_moa": "Blue Moa",
   "gui.aether.moa_skins.skin.boko_yellow": "Boko Yellow",
+  "gui.aether.moa_skins.skin.chicken_moa": "Chicken Moa",
   "gui.aether.moa_skins.skin.classic_moa": "Classic Moa",
   "gui.aether.moa_skins.skin.cockatrice_moa": "Cockatrice",
+  "gui.aether.moa_skins.skin.construction_bot": "Construction Bot",
   "gui.aether.moa_skins.skin.crookjaw_purple": "Crookjaw Purple",
+  "gui.aether.moa_skins.skin.frozen_phoenix": "Frozen Phoenix",
+  "gui.aether.moa_skins.skin.gargoyle_moa": "Gargoyle Moa",
   "gui.aether.moa_skins.skin.gharrix_red": "Gharrix Red",
+  "gui.aether.moa_skins.skin.gilded_gharrix": "Gilded Gharrix",
   "gui.aether.moa_skins.skin.halcian_pink": "Halcian Pink",
+  "gui.aether.moa_skins.skin.molten_moa": "Molten Moa",
+  "gui.aether.moa_skins.skin.mossy_statue_moa": "Mossy Statue Moa",
   "gui.aether.moa_skins.skin.phoenix_moa": "Phoenix Moa",
   "gui.aether.moa_skins.skin.sentry_moa": "Sentry Moa",
+  "gui.aether.moa_skins.skin.stratus": "Stratus",
   "gui.aether.moa_skins.skin.tivalier_green": "Tivalier Green",
+  "gui.aether.moa_skins.skin.undead_moa": "Undead Moa",
   "gui.aether.moa_skins.skin.valkyrie_moa": "Valkyrie Moa",
   "gui.aether.moa_skins.skin.white_moa": "White Moa",
   "gui.aether.moa_skins.text.donate": "Donate to the project to get Moa Skins!",
@@ -1054,6 +1064,7 @@
   "subtitles.aether.item.accessory.equip_iron_ring": "Iron Ring jingles",
   "subtitles.aether.item.accessory.equip_zanite_pendant": "Zanite Pendant jingles",
   "subtitles.aether.item.accessory.equip_zanite_ring": "Zanite Ring jingles",
+  "subtitles.aether.item.ambrosium_shard.use": "Ambrosium Shard used",
   "subtitles.aether.item.armor.equip_gravitite": "Gravitite armor clinks",
   "subtitles.aether.item.armor.equip_neptune": "Neptune armor clinks",
   "subtitles.aether.item.armor.equip_obsidian": "Obsidian armor clanks",
@@ -1063,5 +1074,6 @@
   "subtitles.aether.item.armor.equip_zanite": "Zanite armor clangs",
   "subtitles.aether.item.dart_shooter.shoot": "Dart Shooter fired",
   "subtitles.aether.item.hammer_of_kingbdogz.shoot": "Hammer fired",
-  "subtitles.aether.item.lightning_knife.shoot": "Lightning Knife flies"
+  "subtitles.aether.item.lightning_knife.shoot": "Lightning Knife flies",
+  "subtitles.aether.item.swet_ball.use": "Swet Ball used"
 }

src/generated/resources/assets/aether/sounds.json

@@ -713,6 +713,12 @@
     ],
     "subtitle": "subtitles.aether.item.accessory.equip_zanite_ring"
   },
+  "item.ambrosium_shard.use": {
+    "sounds": [
+      "block/amethyst/shimmer"
+    ],
+    "subtitle": "subtitles.aether.item.ambrosium_shard.use"
+  },
   "item.armor.equip_gravitite": {
     "sounds": [
       "item/armor/equip_gold1",
@@ -836,6 +842,15 @@
       }
     ]
   },
+  "item.swet_ball.use": {
+    "sounds": [
+      "mob/slime/big1",
+      "mob/slime/big2",
+      "mob/slime/big3",
+      "mob/slime/big4"
+    ],
+    "subtitle": "subtitles.aether.item.swet_ball.use"
+  },
   "music.aether": {
     "sounds": [
       {

src/generated/resources/assets/aether/tips/aerogel_explosion_resistance.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.aerogel_explosion_resistance"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/aether_day_length.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.aether_day_length"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/altar_repairing.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.altar_repairing"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/ambrosium_shard_fuel.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.ambrosium_shard_fuel"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/blue_aerclouds.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.blue_aerclouds"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/champs.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.champs"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/check_surroundings.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.check_surroundings"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/close_door.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.close_door"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/cold_parachute_crafting.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.cold_parachute_crafting"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/creepers.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.creepers"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/dart_shooter_crafting.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.dart_shooter_crafting"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/darts_no_gravity.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.darts_no_gravity"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/difficulty.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.difficulty"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/dig_straight_down.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.dig_straight_down"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/do_things.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.do_things"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/drops.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.drops"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/dungeon_rewards.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.dungeon_rewards"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/dungeon_tiers.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.dungeon_tiers"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/enchant_blue_disk.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.enchant_blue_disk"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/enchanted_gravitite_crafting.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.enchanted_gravitite_crafting"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/enchanted_gravitite_floating.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.enchanted_gravitite_floating"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/expectations.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.expectations"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}

src/generated/resources/assets/aether/tips/glowstone_portal_forming.json

@@ -0,0 +1,11 @@
+{
+  "tip": {
+    "translate": "aether.pro_tips.line.aether.glowstone_portal_forming"
+  },
+  "title": {
+    "bold": true,
+    "color": "yellow",
+    "translate": "gui.aether.pro_tip",
+    "underlined": true
+  }
+}