Merge branch 'Alpha' into 1.20

vindocel · Jul 25, 2023 · ffcad33 · ffcad33
2 parents 72a03d7 + 9b82881
commit ffcad33
Show file tree

Hide file tree

Showing 83 changed files with 2 additions and 1 deletion.
diff --git a/assets/bhc/textures/gui/blade_of_vitality.png b/assets/bhc/textures/gui/blade_of_vitality.png
diff --git a/assets/crafting_on_a_stick/textures/item/curios_on_a_stick.png b/assets/crafting_on_a_stick/textures/item/curios_on_a_stick.png
diff --git a/assets/enderio/textures/gui/40/advanced_item_filter.png b/assets/enderio/textures/gui/40/advanced_item_filter.png
diff --git a/assets/enderio/textures/gui/40/basic_item_filter.png b/assets/enderio/textures/gui/40/basic_item_filter.png
diff --git a/assets/enderio/textures/gui/40/big_item_filter.png b/assets/enderio/textures/gui/40/big_item_filter.png
diff --git a/assets/enderio/textures/gui/40/dsu.png b/assets/enderio/textures/gui/40/dsu.png
diff --git a/assets/enderio/textures/gui/40/fluid_filter.png b/assets/enderio/textures/gui/40/fluid_filter.png
diff --git a/assets/enderio/textures/gui/40/infinity.png b/assets/enderio/textures/gui/40/infinity.png
diff --git a/assets/enderio/textures/gui/40/inventory_1x2.png b/assets/enderio/textures/gui/40/inventory_1x2.png
diff --git a/assets/enderio/textures/gui/40/inventory_1x4.png b/assets/enderio/textures/gui/40/inventory_1x4.png
diff --git a/assets/enderio/textures/gui/40/inventory_1x6.png b/assets/enderio/textures/gui/40/inventory_1x6.png
diff --git a/assets/enderio/textures/gui/40/inventory_3x2.png b/assets/enderio/textures/gui/40/inventory_3x2.png
diff --git a/assets/enderio/textures/gui/40/inventory_3x4.png b/assets/enderio/textures/gui/40/inventory_3x4.png
diff --git a/assets/enderio/textures/gui/40/inventory_3x6.png b/assets/enderio/textures/gui/40/inventory_3x6.png
diff --git a/assets/enderio/textures/gui/40/inventory_5x2.png b/assets/enderio/textures/gui/40/inventory_5x2.png
diff --git a/assets/enderio/textures/gui/40/inventory_5x4.png b/assets/enderio/textures/gui/40/inventory_5x4.png
diff --git a/assets/enderio/textures/gui/40/inventory_5x6.png b/assets/enderio/textures/gui/40/inventory_5x6.png
diff --git a/assets/enderio/textures/gui/40/inventory_7x2.png b/assets/enderio/textures/gui/40/inventory_7x2.png
diff --git a/assets/enderio/textures/gui/40/inventory_7x4.png b/assets/enderio/textures/gui/40/inventory_7x4.png
diff --git a/assets/enderio/textures/gui/40/inventory_7x6.png b/assets/enderio/textures/gui/40/inventory_7x6.png
diff --git a/assets/enderio/textures/gui/40/inventory_9x2.png b/assets/enderio/textures/gui/40/inventory_9x2.png
diff --git a/assets/enderio/textures/gui/40/inventory_9x4.png b/assets/enderio/textures/gui/40/inventory_9x4.png
diff --git a/assets/enderio/textures/gui/40/inventory_9x6.png b/assets/enderio/textures/gui/40/inventory_9x6.png
diff --git a/assets/enderio/textures/gui/40/item_filter.png b/assets/enderio/textures/gui/40/item_filter.png
diff --git a/assets/enderio/textures/gui/40/location_printout.png b/assets/enderio/textures/gui/40/location_printout.png
diff --git a/assets/enderio/textures/gui/40/mod_item_filter.png b/assets/enderio/textures/gui/40/mod_item_filter.png
diff --git a/assets/enderio/textures/gui/40/soul_filter_big.png b/assets/enderio/textures/gui/40/soul_filter_big.png
diff --git a/assets/enderio/textures/gui/40/soul_filter_normal.png b/assets/enderio/textures/gui/40/soul_filter_normal.png
diff --git a/assets/enderio/textures/gui/40/widgetsv2.png b/assets/enderio/textures/gui/40/widgetsv2.png
diff --git a/assets/enderio/textures/gui/alloy_smelter_alloy.png b/assets/enderio/textures/gui/alloy_smelter_alloy.png
diff --git a/assets/enderio/textures/gui/alloy_smelter_auto.png b/assets/enderio/textures/gui/alloy_smelter_auto.png
diff --git a/assets/enderio/textures/gui/alloy_smelter_furnace.png b/assets/enderio/textures/gui/alloy_smelter_furnace.png
diff --git a/assets/enderio/textures/gui/attractor.png b/assets/enderio/textures/gui/attractor.png
diff --git a/assets/enderio/textures/gui/augmented_travel_accessable.png b/assets/enderio/textures/gui/augmented_travel_accessable.png
diff --git a/assets/enderio/textures/gui/buffer_full.png b/assets/enderio/textures/gui/buffer_full.png
diff --git a/assets/enderio/textures/gui/capacitor_bank.png b/assets/enderio/textures/gui/capacitor_bank.png
diff --git a/assets/enderio/textures/gui/checkbox.png b/assets/enderio/textures/gui/checkbox.png
diff --git a/assets/enderio/textures/gui/combustion_gen.png b/assets/enderio/textures/gui/combustion_gen.png
diff --git a/assets/enderio/textures/gui/conduit.png b/assets/enderio/textures/gui/conduit.png
diff --git a/assets/enderio/textures/gui/crafter.png b/assets/enderio/textures/gui/crafter.png
diff --git a/assets/enderio/textures/gui/creative_spawner_admin.png b/assets/enderio/textures/gui/creative_spawner_admin.png
diff --git a/assets/enderio/textures/gui/creative_spawner_user.png b/assets/enderio/textures/gui/creative_spawner_user.png
diff --git a/assets/enderio/textures/gui/dialing_device.png b/assets/enderio/textures/gui/dialing_device.png
diff --git a/assets/enderio/textures/gui/enchanter.png b/assets/enderio/textures/gui/enchanter.png
diff --git a/assets/enderio/textures/gui/experience_obelisk.png b/assets/enderio/textures/gui/experience_obelisk.png
diff --git a/assets/enderio/textures/gui/farm_station.png b/assets/enderio/textures/gui/farm_station.png
diff --git a/assets/enderio/textures/gui/fluidbackground.png b/assets/enderio/textures/gui/fluidbackground.png
diff --git a/assets/enderio/textures/gui/icons.png b/assets/enderio/textures/gui/icons.png
diff --git a/assets/enderio/textures/gui/icons/buttons.png b/assets/enderio/textures/gui/icons/buttons.png
diff --git a/assets/enderio/textures/gui/icons/io_config.png b/assets/enderio/textures/gui/icons/io_config.png
diff --git a/assets/enderio/textures/gui/icons/jei.grinding_ball.png b/assets/enderio/textures/gui/icons/jei.grinding_ball.png
diff --git a/assets/enderio/textures/gui/impulse_hopper.png b/assets/enderio/textures/gui/impulse_hopper.png
diff --git a/assets/enderio/textures/gui/inhibitor.png b/assets/enderio/textures/gui/inhibitor.png
diff --git a/assets/enderio/textures/gui/jei_infinity.png b/assets/enderio/textures/gui/jei_infinity.png
diff --git a/assets/enderio/textures/gui/killer_joe.png b/assets/enderio/textures/gui/killer_joe.png
diff --git a/assets/enderio/textures/gui/lava_generator.png b/assets/enderio/textures/gui/lava_generator.png
diff --git a/assets/enderio/textures/gui/niard.png b/assets/enderio/textures/gui/niard.png
diff --git a/assets/enderio/textures/gui/painter.png b/assets/enderio/textures/gui/painter.png
diff --git a/assets/enderio/textures/gui/painting_machine.png b/assets/enderio/textures/gui/painting_machine.png
diff --git a/assets/enderio/textures/gui/powered_spawner_capture.png b/assets/enderio/textures/gui/powered_spawner_capture.png
diff --git a/assets/enderio/textures/gui/powered_spawner_spawn.png b/assets/enderio/textures/gui/powered_spawner_spawn.png
diff --git a/assets/enderio/textures/gui/primitive_alloy_smelter.png b/assets/enderio/textures/gui/primitive_alloy_smelter.png
diff --git a/assets/enderio/textures/gui/round_robin.png b/assets/enderio/textures/gui/round_robin.png
diff --git a/assets/enderio/textures/gui/sagmill.png b/assets/enderio/textures/gui/sagmill.png
diff --git a/assets/enderio/textures/gui/self_feed.png b/assets/enderio/textures/gui/self_feed.png
diff --git a/assets/enderio/textures/gui/slice_and_splice.png b/assets/enderio/textures/gui/slice_and_splice.png
diff --git a/assets/enderio/textures/gui/soul_binder.png b/assets/enderio/textures/gui/soul_binder.png
diff --git a/assets/enderio/textures/gui/stirling_generator.png b/assets/enderio/textures/gui/stirling_generator.png
diff --git a/assets/enderio/textures/gui/tank.png b/assets/enderio/textures/gui/tank.png
diff --git a/assets/enderio/textures/gui/tele_pad.png b/assets/enderio/textures/gui/tele_pad.png
diff --git a/assets/enderio/textures/gui/transceiver_channel_select.png b/assets/enderio/textures/gui/transceiver_channel_select.png
diff --git a/assets/enderio/textures/gui/transceiver_general.png b/assets/enderio/textures/gui/transceiver_general.png
diff --git a/assets/enderio/textures/gui/travel_accessable.png b/assets/enderio/textures/gui/travel_accessable.png
diff --git a/assets/enderio/textures/gui/travel_auth.png b/assets/enderio/textures/gui/travel_auth.png
diff --git a/assets/enderio/textures/gui/vacuum_chest.png b/assets/enderio/textures/gui/vacuum_chest.png
diff --git a/assets/enderio/textures/gui/vat.png b/assets/enderio/textures/gui/vat.png
diff --git a/assets/enderio/textures/gui/weather_obelisk.png b/assets/enderio/textures/gui/weather_obelisk.png
diff --git a/assets/enderio/textures/gui/wired_charger.png b/assets/enderio/textures/gui/wired_charger.png
diff --git a/assets/enderio/textures/gui/wired_charger_baubles.png b/assets/enderio/textures/gui/wired_charger_baubles.png
diff --git a/assets/enderio/textures/gui/xp_vacuum.png b/assets/enderio/textures/gui/xp_vacuum.png
diff --git a/assets/enderio/textures/gui/zombie_generator.png b/assets/enderio/textures/gui/zombie_generator.png
diff --git a/assets/minecraft/texts/splashes.txt b/assets/minecraft/texts/splashes.txt
@@ -1 +1 @@
-v1.4.7
+v1.4.8
diff --git a/mod support.md b/mod support.md
@@ -37,6 +37,7 @@
 | Dragon Survival | <a href=https://www.curseforge.com/minecraft/mc-mods/dragons-survival>here</a> |
 | Engineer's Decor | <a href=https://www.curseforge.com/minecraft/mc-mods/engineers-decor>here</a> |
 | Elemental Craft | <a href=https://www.curseforge.com/minecraft/mc-mods/elemental-craft>here</a> |
+| Ender IO | <a href=https://legacy.curseforge.com/minecraft/mc-mods/ender-io>here</a> |
 | EvilCraft | <a href=https://www.curseforge.com/minecraft/mc-mods/evilcraft>here</a> |
 | Ex Machinis | <a href=https://www.curseforge.com/minecraft/mc-mods/ex-machinis>here</a> |
 | Ex Nihilo: Sequentia | <a href=https://www.curseforge.com/minecraft/mc-mods/ex-nihilo-sequentia>here</a> |