Merge branch 'Alpha' into 1.19.4

vindocel · May 6, 2023 · 1d10013 · 1d10013
2 parents ca3e687 + 02a450e
commit 1d10013
Show file tree

Hide file tree

Showing 63 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 
 *.psd
-._*
+._*
+.DS_Store*
diff --git a/assets/avaritia/textures/gui/compressor.png b/assets/avaritia/textures/gui/compressor.png
diff --git a/assets/avaritia/textures/gui/extreme_crafting.png b/assets/avaritia/textures/gui/extreme_crafting.png
diff --git a/assets/avaritia/textures/gui/extreme_crafting_jei.png b/assets/avaritia/textures/gui/extreme_crafting_jei.png
diff --git a/assets/avaritia/textures/gui/neutron_collector.png b/assets/avaritia/textures/gui/neutron_collector.png
diff --git a/assets/custommachinery/textures/gui/background.png b/assets/custommachinery/textures/gui/background.png
diff --git a/assets/custommachinery/textures/gui/base_background.png b/assets/custommachinery/textures/gui/base_background.png
diff --git a/assets/custommachinery/textures/gui/base_config.png b/assets/custommachinery/textures/gui/base_config.png
diff --git a/assets/custommachinery/textures/gui/base_config_hovered.png b/assets/custommachinery/textures/gui/base_config_hovered.png
diff --git a/assets/custommachinery/textures/gui/base_empty.png b/assets/custommachinery/textures/gui/base_empty.png
diff --git a/assets/custommachinery/textures/gui/base_energy_storage_empty.png b/assets/custommachinery/textures/gui/base_energy_storage_empty.png
diff --git a/assets/custommachinery/textures/gui/base_energy_storage_filled.png b/assets/custommachinery/textures/gui/base_energy_storage_filled.png
diff --git a/assets/custommachinery/textures/gui/base_fluid_storage.png b/assets/custommachinery/textures/gui/base_fluid_storage.png
diff --git a/assets/custommachinery/textures/gui/base_fuel_empty.png b/assets/custommachinery/textures/gui/base_fuel_empty.png
diff --git a/assets/custommachinery/textures/gui/base_fuel_filled.png b/assets/custommachinery/textures/gui/base_fuel_filled.png
diff --git a/assets/custommachinery/textures/gui/base_inventory.png b/assets/custommachinery/textures/gui/base_inventory.png
diff --git a/assets/custommachinery/textures/gui/base_progress_empty.png b/assets/custommachinery/textures/gui/base_progress_empty.png
diff --git a/assets/custommachinery/textures/gui/base_progress_filled.png b/assets/custommachinery/textures/gui/base_progress_filled.png
diff --git a/assets/custommachinery/textures/gui/base_slot.png b/assets/custommachinery/textures/gui/base_slot.png
diff --git a/assets/custommachinery/textures/gui/config/auto_io_mode.png b/assets/custommachinery/textures/gui/config/auto_io_mode.png
diff --git a/assets/custommachinery/textures/gui/config/exit_button.png b/assets/custommachinery/textures/gui/config/exit_button.png
diff --git a/assets/custommachinery/textures/gui/config/side_mode.png b/assets/custommachinery/textures/gui/config/side_mode.png
diff --git a/assets/custommachinery/textures/gui/creation/machine_list_background.png b/assets/custommachinery/textures/gui/creation/machine_list_background.png
diff --git a/assets/custommachinery/textures/gui/creation/tabs.png b/assets/custommachinery/textures/gui/creation/tabs.png
diff --git a/assets/custommachinery/textures/gui/machine_creator.png b/assets/custommachinery/textures/gui/machine_creator.png
diff --git a/assets/extendedcrafting/textures/gui/advanced_auto_table.png b/assets/extendedcrafting/textures/gui/advanced_auto_table.png
diff --git a/assets/extendedcrafting/textures/gui/advanced_table.png b/assets/extendedcrafting/textures/gui/advanced_table.png
diff --git a/assets/extendedcrafting/textures/gui/auto_ender_crafter.png b/assets/extendedcrafting/textures/gui/auto_ender_crafter.png
diff --git a/assets/extendedcrafting/textures/gui/auto_flux_crafter.png b/assets/extendedcrafting/textures/gui/auto_flux_crafter.png
diff --git a/assets/extendedcrafting/textures/gui/basic_auto_table.png b/assets/extendedcrafting/textures/gui/basic_auto_table.png
diff --git a/assets/extendedcrafting/textures/gui/basic_table.png b/assets/extendedcrafting/textures/gui/basic_table.png
diff --git a/assets/extendedcrafting/textures/gui/compressor.png b/assets/extendedcrafting/textures/gui/compressor.png
diff --git a/assets/extendedcrafting/textures/gui/crafting_core.png b/assets/extendedcrafting/textures/gui/crafting_core.png
diff --git a/assets/extendedcrafting/textures/gui/elite_auto_table.png b/assets/extendedcrafting/textures/gui/elite_auto_table.png
diff --git a/assets/extendedcrafting/textures/gui/elite_table.png b/assets/extendedcrafting/textures/gui/elite_table.png
diff --git a/assets/extendedcrafting/textures/gui/ender_crafter.png b/assets/extendedcrafting/textures/gui/ender_crafter.png
diff --git a/assets/extendedcrafting/textures/gui/flux_alternator.png b/assets/extendedcrafting/textures/gui/flux_alternator.png
diff --git a/assets/extendedcrafting/textures/gui/flux_crafter.png b/assets/extendedcrafting/textures/gui/flux_crafter.png
diff --git a/assets/extendedcrafting/textures/gui/ultimate_auto_table.png b/assets/extendedcrafting/textures/gui/ultimate_auto_table.png
diff --git a/assets/extendedcrafting/textures/gui/ultimate_table.png b/assets/extendedcrafting/textures/gui/ultimate_table.png
diff --git a/assets/extendedcrafting/textures/gui/widgets.png b/assets/extendedcrafting/textures/gui/widgets.png
diff --git a/assets/extendedcrafting/textures/jei/advanced_crafting.png b/assets/extendedcrafting/textures/jei/advanced_crafting.png
diff --git a/assets/extendedcrafting/textures/jei/basic_crafting.png b/assets/extendedcrafting/textures/jei/basic_crafting.png
diff --git a/assets/extendedcrafting/textures/jei/combination_crafting.png b/assets/extendedcrafting/textures/jei/combination_crafting.png
diff --git a/assets/extendedcrafting/textures/jei/compressor.png b/assets/extendedcrafting/textures/jei/compressor.png
diff --git a/assets/extendedcrafting/textures/jei/elite_crafting.png b/assets/extendedcrafting/textures/jei/elite_crafting.png
diff --git a/assets/extendedcrafting/textures/jei/ender_crafting.png b/assets/extendedcrafting/textures/jei/ender_crafting.png
diff --git a/assets/extendedcrafting/textures/jei/flux_crafting.png b/assets/extendedcrafting/textures/jei/flux_crafting.png
diff --git a/assets/extendedcrafting/textures/jei/icons.png b/assets/extendedcrafting/textures/jei/icons.png
diff --git a/assets/extendedcrafting/textures/jei/ultimate_crafting.png b/assets/extendedcrafting/textures/jei/ultimate_crafting.png
diff --git a/assets/minecraft/texts/splashes.txt b/assets/minecraft/texts/splashes.txt
@@ -1 +1 @@
-v1.4.5
+v1.4.6
diff --git a/assets/miniutilities/textures/gui/base.png b/assets/miniutilities/textures/gui/base.png
diff --git a/assets/miniutilities/textures/gui/mechanical_miner.png b/assets/miniutilities/textures/gui/mechanical_miner.png
diff --git a/assets/miniutilities/textures/gui/template.png b/assets/miniutilities/textures/gui/template.png
diff --git a/assets/simplyjetpacks/textures/gui/empty_jetpack_slot.png b/assets/simplyjetpacks/textures/gui/empty_jetpack_slot.png
diff --git a/assets/simplyjetpacks/textures/gui/jetpack_screen.png b/assets/simplyjetpacks/textures/gui/jetpack_screen.png
diff --git a/assets/waterstrainer/textures/gui/jei_garden_trowel.png b/assets/waterstrainer/textures/gui/jei_garden_trowel.png
diff --git a/assets/waterstrainer/textures/gui/jei_strainer.png b/assets/waterstrainer/textures/gui/jei_strainer.png
diff --git a/assets/waterstrainer/textures/gui/jei_worm_bin.png b/assets/waterstrainer/textures/gui/jei_worm_bin.png
diff --git a/assets/waterstrainer/textures/gui/strainer_base.png b/assets/waterstrainer/textures/gui/strainer_base.png
diff --git a/assets/waterstrainer/textures/gui/worm_bin.png b/assets/waterstrainer/textures/gui/worm_bin.png
diff --git a/assets/woodworks/textures/gui/container/sawmill.png b/assets/woodworks/textures/gui/container/sawmill.png
diff --git a/mod support.md b/mod support.md
@@ -8,6 +8,7 @@
 | Applied Energistics 2 | <a href=https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2>here</a> |
 | Applied Energistics 2 Wireless Terminals | <a href=https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2-wireless-terminals>here</a> |
 | Apotheosis | <a href=https://www.curseforge.com/minecraft/mc-mods/apotheosis>here</a> |
+| Avaritia 1.1x | <a href=https://www.curseforge.com/minecraft/mc-mods/avaritia-1-10>here</a> |
 | Baubley Heart Canisters | <a href=https://www.curseforge.com/minecraft/mc-mods/baubley-heart-canisters>here</a> |
 | Beyond Earth | <a href=https://www.curseforge.com/minecraft/mc-mods/beyond-earth>here</a> |
 | Better Advancements | <a href=https://www.curseforge.com/minecraft/mc-mods/better-advancements>here</a> |
@@ -26,6 +27,7 @@
 | Corpse | <a href=https://www.curseforge.com/minecraft/mc-mods/corpse>here</a> |
 | Create | <a href=https://www.curseforge.com/minecraft/mc-mods/create>here</a> |
 | Curios API | <a href=https://www.curseforge.com/minecraft/mc-mods/curios>here</a> |
+| Custom Machinery | <a href=https://www.curseforge.com/minecraft/mc-mods/custom-machinery>here</a> |
 | Cyclic | <a href=https://www.curseforge.com/minecraft/mc-mods/cyclic>here</a> |
 | Cyclops Core | <a href=https://www.curseforge.com/minecraft/mc-mods/cyclops-core>here</a> |
 | Deep Resonance | <a href=https://www.curseforge.com/minecraft/mc-mods/deep-resonance>here</a> |
@@ -36,6 +38,7 @@
 | 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> |
+| Extended Crafting | <a href=https://www.curseforge.com/minecraft/mc-mods/extended-crafting>here</a> |
 | Extreme Sound Muffler | <a href=https://www.curseforge.com/minecraft/mc-mods/extreme-sound-muffler>here</a> |
 | Farmer's Delight | <a href=https://www.curseforge.com/minecraft/mc-mods/farmers-delight>here</a> |
 | Farming for Blockheads | <a href=https://www.curseforge.com/minecraft/mc-mods/farming-for-blockheads>here</a> |
@@ -69,6 +72,7 @@
 | Mekanism | <a href=https://www.curseforge.com/minecraft/mc-mods/mekanism>here</a> |
 | ME Requester | <a href=https://www.curseforge.com/minecraft/mc-mods/merequester>here</a> |
 | MineColonies | <a href=https://www.curseforge.com/minecraft/mc-mods/minecolonies>here</a> |
+| Mini Utilities | <a href=https://www.curseforge.com/minecraft/mc-mods/miniutilities>here</a> |
 | Mob Grinding Utils | <a href=https://www.curseforge.com/minecraft/mc-mods/mob-grinding-utils>here</a> |
 | Mo' Shiz Mod | <a href=https://www.curseforge.com/minecraft/mc-mods/mo-shiz-mod>here</a> |
 | MrCrayfish's Furniture Mod | <a href=https://www.curseforge.com/minecraft/mc-mods/mrcrayfish-furniture-mod>here</a> |
@@ -100,6 +104,7 @@
 | RFTools Utility | <a href=https://www.curseforge.com/minecraft/mc-mods/rftools-utility>here</a> |
 | Security Craft | <a href=https://www.curseforge.com/minecraft/mc-mods/security-craft>here</a> |
 | Simple Magnets | <a href=https://www.curseforge.com/minecraft/mc-mods/simple-magnets>here</a> |
+| Simply Jetpacks 2 | <a href=https://www.curseforge.com/minecraft/mc-mods/simply-jetpacks-2>here</a> |
 | Simple Storage Network | <a href=https://www.curseforge.com/minecraft/mc-mods/simple-storage-network>here</a> |
 | Summoning Rituals | <a href=https://www.curseforge.com/minecraft/mc-mods/summoningrituals>here</a> |
 | Sophisticated Backpacks | <a href=https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks>here</a> |
@@ -116,4 +121,6 @@
 | Tinkers Construct | <a href=https://www.curseforge.com/minecraft/mc-mods/tinkers-construct>here</a> |
 | The Twilight Forest | <a href=https://www.curseforge.com/minecraft/mc-mods/the-twilight-forest>here</a> |
 | Tom's Simple Storage | <a href=https://www.curseforge.com/minecraft/mc-mods/toms-storage>here</a> |
+| Water Strainer | <a href=https://www.curseforge.com/minecraft/mc-mods/water-strainer>here</a> |
+| Woodworks | <a href=https://www.curseforge.com/minecraft/mc-mods/woodworks>here</a> |
 | XNet | <a href=https://www.curseforge.com/minecraft/mc-mods/xnet>here</a> |