Merge remote-tracking branch 'refs/remotes/origin/master'

HiedaCamellia · Apr 20, 2024 · dca8d34 · dca8d34
2 parents 97934b6 + 3391f25
commit dca8d34
Show file tree

Hide file tree

Showing 72 changed files with 25 additions and 0 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,25 @@
+name: Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Gradle 8.6
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: 8.6
+      - name: Build with Gradle 8.6
+        run: gradle build
diff --git a/...ucleardelight/textures/NuclearDelight.png → ...ucleardelight/textures/NuclearDelight.png b/...ucleardelight/textures/NuclearDelight.png → ...ucleardelight/textures/NuclearDelight.png
diff --git a/...es/nucleardelight/textures/lead_block.png → ...leardelight/textures/block/lead_block.png b/...es/nucleardelight/textures/lead_block.png → ...leardelight/textures/block/lead_block.png
diff --git a/...delight/textures/nuclear_stove_bottom.png → ...t/textures/block/nuclear_stove_bottom.png b/...delight/textures/nuclear_stove_bottom.png → ...t/textures/block/nuclear_stove_bottom.png
diff --git a/...rdelight/textures/nuclear_stove_front.png → ...ht/textures/block/nuclear_stove_front.png b/...rdelight/textures/nuclear_stove_front.png → ...ht/textures/block/nuclear_stove_front.png
diff --git a/...light/textures/nuclear_stove_front_on.png → ...textures/block/nuclear_stove_front_on.png b/...light/textures/nuclear_stove_front_on.png → ...textures/block/nuclear_stove_front_on.png
diff --git a/...ardelight/textures/nuclear_stove_side.png → ...ght/textures/block/nuclear_stove_side.png b/...ardelight/textures/nuclear_stove_side.png → ...ght/textures/block/nuclear_stove_side.png
diff --git a/...eardelight/textures/nuclear_stove_top.png → ...ight/textures/block/nuclear_stove_top.png b/...eardelight/textures/nuclear_stove_top.png → ...ight/textures/block/nuclear_stove_top.png
diff --git a/...delight/textures/nuclear_stove_top_on.png → ...t/textures/block/nuclear_stove_top_on.png b/...delight/textures/nuclear_stove_top_on.png → ...t/textures/block/nuclear_stove_top_on.png
diff --git a/...cleardelight/textures/plutonium_block.png → ...elight/textures/block/plutonium_block.png b/...cleardelight/textures/plutonium_block.png → ...elight/textures/block/plutonium_block.png
diff --git a/...ucleardelight/textures/polonium_block.png → ...delight/textures/block/polonium_block.png b/...ucleardelight/textures/polonium_block.png → ...delight/textures/block/polonium_block.png
diff --git a/.../nucleardelight/textures/radon_lamp_1.png → ...ardelight/textures/block/radon_lamp_1.png b/.../nucleardelight/textures/radon_lamp_1.png → ...ardelight/textures/block/radon_lamp_1.png
diff --git a/.../nucleardelight/textures/radon_lamp_2.png → ...ardelight/textures/block/radon_lamp_2.png b/.../nucleardelight/textures/radon_lamp_2.png → ...ardelight/textures/block/radon_lamp_2.png
diff --git a/.../nucleardelight/textures/radon_lamp_3.png → ...ardelight/textures/block/radon_lamp_3.png b/.../nucleardelight/textures/radon_lamp_3.png → ...ardelight/textures/block/radon_lamp_3.png
diff --git a/.../nucleardelight/textures/radon_lamp_4.png → ...ardelight/textures/block/radon_lamp_4.png b/.../nucleardelight/textures/radon_lamp_4.png → ...ardelight/textures/block/radon_lamp_4.png
diff --git a/...nucleardelight/textures/thorium_block.png → ...rdelight/textures/block/thorium_block.png b/...nucleardelight/textures/thorium_block.png → ...rdelight/textures/block/thorium_block.png
diff --git a/...nucleardelight/textures/uranium_block.png → ...rdelight/textures/block/uranium_block.png b/...nucleardelight/textures/uranium_block.png → ...rdelight/textures/block/uranium_block.png
diff --git a/...es/nucleardelight/textures/amifostine.png → ...cleardelight/textures/item/amifostine.png b/...es/nucleardelight/textures/amifostine.png → ...cleardelight/textures/item/amifostine.png
diff --git a/...nucleardelight/textures/apple_jam_jar.png → ...ardelight/textures/item/apple_jam_jar.png b/...nucleardelight/textures/apple_jam_jar.png → ...ardelight/textures/item/apple_jam_jar.png
diff --git a/...ardelight/textures/apple_jam_sandwich.png → ...ight/textures/item/apple_jam_sandwich.png b/...ardelight/textures/apple_jam_sandwich.png → ...ight/textures/item/apple_jam_sandwich.png
diff --git a/...ardelight/textures/broken_ender_pearl.png → ...ight/textures/item/broken_ender_pearl.png b/...ardelight/textures/broken_ender_pearl.png → ...ight/textures/item/broken_ender_pearl.png
diff --git a/...es/nucleardelight/textures/burst_soup.png → ...cleardelight/textures/item/burst_soup.png b/...es/nucleardelight/textures/burst_soup.png → ...cleardelight/textures/item/burst_soup.png
diff --git a/...light/textures/cod_with_creeper_sauce.png → .../textures/item/cod_with_creeper_sauce.png b/...light/textures/cod_with_creeper_sauce.png → .../textures/item/cod_with_creeper_sauce.png
diff --git a/...cleardelight/textures/creeper_jam_jar.png → ...delight/textures/item/creeper_jam_jar.png b/...cleardelight/textures/creeper_jam_jar.png → ...delight/textures/item/creeper_jam_jar.png
diff --git a/...leardelight/textures/creeper_material.png → ...elight/textures/item/creeper_material.png b/...leardelight/textures/creeper_material.png → ...elight/textures/item/creeper_material.png
diff --git a/.../nucleardelight/textures/ender_rocket.png → ...eardelight/textures/item/ender_rocket.png b/.../nucleardelight/textures/ender_rocket.png → ...eardelight/textures/item/ender_rocket.png
diff --git a/...ardelight/textures/glow_berry_jam_jar.png → ...ight/textures/item/glow_berry_jam_jar.png b/...ardelight/textures/glow_berry_jam_jar.png → ...ight/textures/item/glow_berry_jam_jar.png
diff --git a/...ight/textures/glow_berry_jam_sandwich.png → ...textures/item/glow_berry_jam_sandwich.png b/...ight/textures/glow_berry_jam_sandwich.png → ...textures/item/glow_berry_jam_sandwich.png
diff --git a/...light/textures/glow_cold_chicken_rack.png → .../textures/item/glow_cold_chicken_rack.png b/...light/textures/glow_cold_chicken_rack.png → .../textures/item/glow_cold_chicken_rack.png
diff --git a/...es/nucleardelight/textures/lead_ingot.png → ...cleardelight/textures/item/lead_ingot.png b/...es/nucleardelight/textures/lead_ingot.png → ...cleardelight/textures/item/lead_ingot.png
diff --git a/...ces/nucleardelight/textures/nuka_cola.png → ...ucleardelight/textures/item/nuka_cola.png b/...ces/nucleardelight/textures/nuka_cola.png → ...ucleardelight/textures/item/nuka_cola.png
diff --git a/...eardelight/textures/nuka_cola_quantum.png → ...light/textures/item/nuka_cola_quantum.png b/...eardelight/textures/nuka_cola_quantum.png → ...light/textures/item/nuka_cola_quantum.png
diff --git a/...eardelight/textures/nuka_cola_victory.png → ...light/textures/item/nuka_cola_victory.png b/...eardelight/textures/nuka_cola_victory.png → ...light/textures/item/nuka_cola_victory.png
diff --git a/...light/textures/pasta_with_ender_pearl.png → .../textures/item/pasta_with_ender_pearl.png b/...light/textures/pasta_with_ender_pearl.png → .../textures/item/pasta_with_ender_pearl.png
diff --git a/...ght/textures/pentetate_zinc_trisodium.png → ...extures/item/pentetate_zinc_trisodium.png b/...ght/textures/pentetate_zinc_trisodium.png → ...extures/item/pentetate_zinc_trisodium.png
diff --git a/...cleardelight/textures/plutonium_ingot.png → ...delight/textures/item/plutonium_ingot.png b/...cleardelight/textures/plutonium_ingot.png → ...delight/textures/item/plutonium_ingot.png
diff --git a/...ucleardelight/textures/polonium_ingot.png → ...rdelight/textures/item/polonium_ingot.png b/...ucleardelight/textures/polonium_ingot.png → ...rdelight/textures/item/polonium_ingot.png
diff --git a/...eardelight/textures/radiation_chowder.png → ...light/textures/item/radiation_chowder.png b/...eardelight/textures/radiation_chowder.png → ...light/textures/item/radiation_chowder.png
diff --git a/...t/textures/radioactive_barbecue_stick.png → ...tures/item/radioactive_barbecue_stick.png b/...t/textures/radioactive_barbecue_stick.png → ...tures/item/radioactive_barbecue_stick.png
diff --git a/.../nucleardelight/textures/radon_bottle.png → ...eardelight/textures/item/radon_bottle.png b/.../nucleardelight/textures/radon_bottle.png → ...eardelight/textures/item/radon_bottle.png
diff --git a/...leardelight/textures/raw_warden_steak.png → ...elight/textures/item/raw_warden_steak.png b/...leardelight/textures/raw_warden_steak.png → ...elight/textures/item/raw_warden_steak.png
diff --git a/...ght/textures/seafood_strong_miso_soup.png → ...extures/item/seafood_strong_miso_soup.png b/...ght/textures/seafood_strong_miso_soup.png → ...extures/item/seafood_strong_miso_soup.png
diff --git a/...cleardelight/textures/slime_blaze_jam.png → ...delight/textures/item/slime_blaze_jam.png b/...cleardelight/textures/slime_blaze_jam.png → ...delight/textures/item/slime_blaze_jam.png
diff --git a/...t/textures/stir_fried_strong_porkchop.png → ...tures/item/stir_fried_strong_porkchop.png b/...t/textures/stir_fried_strong_porkchop.png → ...tures/item/stir_fried_strong_porkchop.png
diff --git a/...ardelight/textures/strider_tenderloin.png → ...ight/textures/item/strider_tenderloin.png b/...ardelight/textures/strider_tenderloin.png → ...ight/textures/item/strider_tenderloin.png
diff --git a/...s/strider_tenderloin_with_blaze_sauce.png → ...m/strider_tenderloin_with_blaze_sauce.png b/...s/strider_tenderloin_with_blaze_sauce.png → ...m/strider_tenderloin_with_blaze_sauce.png
diff --git a/...cleardelight/textures/strong_ammonium.png → ...delight/textures/item/strong_ammonium.png b/...cleardelight/textures/strong_ammonium.png → ...delight/textures/item/strong_ammonium.png
diff --git a/...eardelight/textures/strong_ender_stew.png → ...light/textures/item/strong_ender_stew.png b/...eardelight/textures/strong_ender_stew.png → ...light/textures/item/strong_ender_stew.png
diff --git a/...rdelight/textures/sweet_berry_jam_jar.png → ...ght/textures/item/sweet_berry_jam_jar.png b/...rdelight/textures/sweet_berry_jam_jar.png → ...ght/textures/item/sweet_berry_jam_jar.png
diff --git a/...ght/textures/sweet_berry_jam_sandwich.png → ...extures/item/sweet_berry_jam_sandwich.png b/...ght/textures/sweet_berry_jam_sandwich.png → ...extures/item/sweet_berry_jam_sandwich.png
diff --git a/...cleardelight/textures/sweet_berry_pie.png → ...delight/textures/item/sweet_berry_pie.png b/...cleardelight/textures/sweet_berry_pie.png → ...delight/textures/item/sweet_berry_pie.png
diff --git a/...nucleardelight/textures/thorium_ingot.png → ...ardelight/textures/item/thorium_ingot.png b/...nucleardelight/textures/thorium_ingot.png → ...ardelight/textures/item/thorium_ingot.png
diff --git a/.../nucleardelight/textures/time_jam_jar.png → ...eardelight/textures/item/time_jam_jar.png b/.../nucleardelight/textures/time_jam_jar.png → ...eardelight/textures/item/time_jam_jar.png
diff --git a/...s/nucleardelight/textures/uranium_axe.png → ...leardelight/textures/item/uranium_axe.png b/...s/nucleardelight/textures/uranium_axe.png → ...leardelight/textures/item/uranium_axe.png
diff --git a/...s/nucleardelight/textures/uranium_bun.png → ...leardelight/textures/item/uranium_bun.png b/...s/nucleardelight/textures/uranium_bun.png → ...leardelight/textures/item/uranium_bun.png
diff --git a/...s/nucleardelight/textures/uranium_hoe.png → ...leardelight/textures/item/uranium_hoe.png b/...s/nucleardelight/textures/uranium_hoe.png → ...leardelight/textures/item/uranium_hoe.png
diff --git a/...nucleardelight/textures/uranium_ingot.png → ...ardelight/textures/item/uranium_ingot.png b/...nucleardelight/textures/uranium_ingot.png → ...ardelight/textures/item/uranium_ingot.png
diff --git a/...nucleardelight/textures/uranium_knife.png → ...ardelight/textures/item/uranium_knife.png b/...nucleardelight/textures/uranium_knife.png → ...ardelight/textures/item/uranium_knife.png
diff --git a/...cleardelight/textures/uranium_pickaxe.png → ...delight/textures/item/uranium_pickaxe.png b/...cleardelight/textures/uranium_pickaxe.png → ...delight/textures/item/uranium_pickaxe.png
diff --git a/...ucleardelight/textures/uranium_shovel.png → ...rdelight/textures/item/uranium_shovel.png b/...ucleardelight/textures/uranium_shovel.png → ...rdelight/textures/item/uranium_shovel.png
diff --git a/...nucleardelight/textures/uranium_sword.png → ...ardelight/textures/item/uranium_sword.png b/...nucleardelight/textures/uranium_sword.png → ...ardelight/textures/item/uranium_sword.png
diff --git a/.../nucleardelight/textures/wander_heart.png → ...eardelight/textures/item/wander_heart.png b/.../nucleardelight/textures/wander_heart.png → ...eardelight/textures/item/wander_heart.png
diff --git a/...ucleardelight/textures/wander_jam_jar.png → ...rdelight/textures/item/wander_jam_jar.png b/...ucleardelight/textures/wander_jam_jar.png → ...rdelight/textures/item/wander_jam_jar.png
diff --git a/.../nucleardelight/textures/warden_steak.png → ...eardelight/textures/item/warden_steak.png b/.../nucleardelight/textures/warden_steak.png → ...eardelight/textures/item/warden_steak.png
diff --git a/...s/nucleardelight/textures/yellow_cake.png → ...leardelight/textures/item/yellow_cake.png b/...s/nucleardelight/textures/yellow_cake.png → ...leardelight/textures/item/yellow_cake.png
diff --git a/...eardelight/textures/yellow_cake_slice.png → ...light/textures/item/yellow_cake_slice.png b/...eardelight/textures/yellow_cake_slice.png → ...light/textures/item/yellow_cake_slice.png
diff --git a/...ces/nucleardelight/textures/drift_off.png → ...delight/textures/mob_effect/drift_off.png b/...ces/nucleardelight/textures/drift_off.png → ...delight/textures/mob_effect/drift_off.png
diff --git a/...nucleardelight/textures/embrittlement.png → ...ght/textures/mob_effect/embrittlement.png b/...nucleardelight/textures/embrittlement.png → ...ght/textures/mob_effect/embrittlement.png
diff --git a/...sources/nucleardelight/textures/laser.png → ...leardelight/textures/mob_effect/laser.png b/...sources/nucleardelight/textures/laser.png → ...leardelight/textures/mob_effect/laser.png
diff --git a/...ces/nucleardelight/textures/radiation.png → ...delight/textures/mob_effect/radiation.png b/...ces/nucleardelight/textures/radiation.png → ...delight/textures/mob_effect/radiation.png
diff --git a/...es/nucleardelight/textures/renascence.png → ...elight/textures/mob_effect/renascence.png b/...es/nucleardelight/textures/renascence.png → ...elight/textures/mob_effect/renascence.png
diff --git a/...rces/nucleardelight/textures/vomiting.png → ...rdelight/textures/mob_effect/vomiting.png b/...rces/nucleardelight/textures/vomiting.png → ...rdelight/textures/mob_effect/vomiting.png