diff --git a/assets/appliedenergistics2/textures/items/ItemMaterial.CardFakeCrafting.png b/assets/appliedenergistics2/textures/items/ItemMaterial.CardFakeCrafting.png new file mode 100644 index 000000000..d57edabb1 Binary files /dev/null and b/assets/appliedenergistics2/textures/items/ItemMaterial.CardFakeCrafting.png differ diff --git a/assets/enhancedlootbags/textures/gui/nei.png b/assets/enhancedlootbags/textures/gui/nei.png index 874918a17..8de0933cb 100644 Binary files a/assets/enhancedlootbags/textures/gui/nei.png and b/assets/enhancedlootbags/textures/gui/nei.png differ diff --git a/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE.png b/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE.png new file mode 100644 index 000000000..9f4d53a88 Binary files /dev/null and b/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE.png differ diff --git a/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE.png b/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE.png new file mode 100644 index 000000000..6df6e74de Binary files /dev/null and b/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE.png differ diff --git a/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE.png.mcmeta b/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/assets/gregtech/textures/gui/progressbar/mixer.png b/assets/gregtech/textures/gui/progressbar/mixer.png index 73f26c9c8..ea7166adb 100644 Binary files a/assets/gregtech/textures/gui/progressbar/mixer.png and b/assets/gregtech/textures/gui/progressbar/mixer.png differ diff --git a/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER.png b/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER.png index 5fd106a6d..1d335c797 100644 Binary files a/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER.png and b/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER.png differ diff --git a/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER_OVERLAY.png b/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER_OVERLAY.png index 5f6b69c4c..cce07af58 100644 Binary files a/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER_OVERLAY.png and b/assets/gregtech/textures/items/iconsets/HANDLE_ELECTRIC_SCREWDRIVER_OVERLAY.png differ diff --git a/assets/gregtech/textures/items/iconsets/HANDLE_SCREWDRIVER.png b/assets/gregtech/textures/items/iconsets/HANDLE_SCREWDRIVER.png index c2cf5a90c..b74ea52fa 100644 Binary files a/assets/gregtech/textures/items/iconsets/HANDLE_SCREWDRIVER.png and b/assets/gregtech/textures/items/iconsets/HANDLE_SCREWDRIVER.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/Dreamwood/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/Dreamwood/toolHeadScrewdriver.png index 5d2d2ded8..e6a167dfc 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/Dreamwood/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/Dreamwood/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/toolHeadScrewdriver.png index b66c4a521..5f4ed4840 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/toolHeadScrewdriver.png index a8e2b49a0..4727bf4db 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png index 2f7fa263a..cf0b2cbf9 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver_OVERLAY.png b/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver_OVERLAY.png index fc837d0d2..0b5056b85 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver_OVERLAY.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/toolHeadScrewdriver_OVERLAY.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadScrewdriver.png index 0a98ceac3..2560fcf40 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/toolHeadScrewdriver.png index 36e550794..778be464c 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadScrewdriver.png index b3dba089d..2b8da5bd6 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/universium/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/CUSTOM/universium/toolHeadScrewdriver.png index 72b168a67..88811786f 100644 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/universium/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/CUSTOM/universium/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/vibrant/phasedGold.png b/assets/gregtech/textures/items/materialicons/CUSTOM/vibrant/phasedGold.png deleted file mode 100644 index 917d9ec55..000000000 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/vibrant/phasedGold.png and /dev/null differ diff --git a/assets/gregtech/textures/items/materialicons/CUSTOM/vibrant/vibrantNugget.png b/assets/gregtech/textures/items/materialicons/CUSTOM/vibrant/vibrantNugget.png deleted file mode 100644 index 3e71a3b2c..000000000 Binary files a/assets/gregtech/textures/items/materialicons/CUSTOM/vibrant/vibrantNugget.png and /dev/null differ diff --git a/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/DULL/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/DULL/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/DULL/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/DULL/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png b/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png index 42294f63c..065c06d21 100644 Binary files a/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png and b/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png differ diff --git a/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver_OVERLAY.png b/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver_OVERLAY.png index 42294f63c..065c06d21 100644 Binary files a/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver_OVERLAY.png and b/assets/gregtech/textures/items/materialicons/FIERY/toolHeadScrewdriver_OVERLAY.png differ diff --git a/assets/gregtech/textures/items/materialicons/FINE/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/FINE/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/FINE/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/FINE/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/FLINT/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/FLINT/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/FLINT/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/FLINT/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/FLUID/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/FLUID/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/FLUID/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/FLUID/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/GLASS/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/GLASS/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/GLASS/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/GLASS/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/LEAF/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/LEAF/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/LEAF/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/LEAF/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/NONE/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/NONE/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/NONE/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/NONE/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png b/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png index 31de102d4..b3aebd91b 100644 Binary files a/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png and b/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png differ diff --git a/assets/gregtech/textures/items/materialicons/OPAL/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/OPAL/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/OPAL/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/OPAL/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/PAPER/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/PAPER/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/PAPER/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/PAPER/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/POWDER/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/POWDER/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/POWDER/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/POWDER/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/RUBY/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/RUBY/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/RUBY/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/RUBY/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/SAND/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/SAND/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/SAND/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/SAND/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/SHINY/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/SHINY/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/SHINY/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/SHINY/toolHeadScrewdriver.png differ diff --git a/assets/gregtech/textures/items/materialicons/WOOD/toolHeadScrewdriver.png b/assets/gregtech/textures/items/materialicons/WOOD/toolHeadScrewdriver.png index be77a1e41..1423655c2 100644 Binary files a/assets/gregtech/textures/items/materialicons/WOOD/toolHeadScrewdriver.png and b/assets/gregtech/textures/items/materialicons/WOOD/toolHeadScrewdriver.png differ diff --git a/assets/ic2/textures/blocks/crop/stickreed.4.png b/assets/ic2/textures/blocks/crop/stickreed.4.png index 88c3f7f43..5cda22e38 100644 Binary files a/assets/ic2/textures/blocks/crop/stickreed.4.png and b/assets/ic2/textures/blocks/crop/stickreed.4.png differ diff --git a/assets/ic2/textures/gui/GUIToolbox.png b/assets/ic2/textures/gui/GUIToolbox.png new file mode 100644 index 000000000..968bdc4af Binary files /dev/null and b/assets/ic2/textures/gui/GUIToolbox.png differ diff --git a/assets/logisticspipes/textures/gui/power_junction.png b/assets/logisticspipes/textures/gui/power_junction.png index c8cd24ad0..776c94304 100644 Binary files a/assets/logisticspipes/textures/gui/power_junction.png and b/assets/logisticspipes/textures/gui/power_junction.png differ diff --git a/assets/minecraft/mcpatcher/blank_00000000.png b/assets/minecraft/mcpatcher/blank_00000000.png new file mode 100644 index 000000000..40c72d1f7 Binary files /dev/null and b/assets/minecraft/mcpatcher/blank_00000000.png differ diff --git a/assets/minecraft/mcpatcher/blank_80808080.png b/assets/minecraft/mcpatcher/blank_80808080.png new file mode 100644 index 000000000..757d9b512 Binary files /dev/null and b/assets/minecraft/mcpatcher/blank_80808080.png differ diff --git a/assets/minecraft/mcpatcher/blank_ffffffff.png b/assets/minecraft/mcpatcher/blank_ffffffff.png new file mode 100644 index 000000000..8e286c303 Binary files /dev/null and b/assets/minecraft/mcpatcher/blank_ffffffff.png differ diff --git a/assets/minecraft/mcpatcher/ctm/bookshelf/0.png b/assets/minecraft/mcpatcher/ctm/bookshelf/0.png new file mode 100644 index 000000000..1f38c02ac Binary files /dev/null and b/assets/minecraft/mcpatcher/ctm/bookshelf/0.png differ diff --git a/assets/minecraft/mcpatcher/ctm/bookshelf/1.png b/assets/minecraft/mcpatcher/ctm/bookshelf/1.png new file mode 100644 index 000000000..3df056a8d Binary files /dev/null and b/assets/minecraft/mcpatcher/ctm/bookshelf/1.png differ diff --git a/assets/minecraft/mcpatcher/ctm/bookshelf/2.png b/assets/minecraft/mcpatcher/ctm/bookshelf/2.png new file mode 100644 index 000000000..366e94145 Binary files /dev/null and b/assets/minecraft/mcpatcher/ctm/bookshelf/2.png differ diff --git a/assets/minecraft/mcpatcher/ctm/bookshelf/3.png b/assets/minecraft/mcpatcher/ctm/bookshelf/3.png new file mode 100644 index 000000000..06b671f22 Binary files /dev/null and b/assets/minecraft/mcpatcher/ctm/bookshelf/3.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/0.png b/assets/minecraft/mcpatcher/ctm/glass/0.png index 3c93316f9..b609c9ee1 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/0.png and b/assets/minecraft/mcpatcher/ctm/glass/0.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/1.png b/assets/minecraft/mcpatcher/ctm/glass/1.png index e3432a7aa..8e8af0fae 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/1.png and b/assets/minecraft/mcpatcher/ctm/glass/1.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/10.png b/assets/minecraft/mcpatcher/ctm/glass/10.png index 4187866d9..a8d42cd23 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/10.png and b/assets/minecraft/mcpatcher/ctm/glass/10.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/11.png b/assets/minecraft/mcpatcher/ctm/glass/11.png index e9cda1af0..e2e53c8e6 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/11.png and b/assets/minecraft/mcpatcher/ctm/glass/11.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/12.png b/assets/minecraft/mcpatcher/ctm/glass/12.png index 6c67e461c..6d663c3ed 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/12.png and b/assets/minecraft/mcpatcher/ctm/glass/12.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/13.png b/assets/minecraft/mcpatcher/ctm/glass/13.png index d906044e3..7aa19e4c0 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/13.png and b/assets/minecraft/mcpatcher/ctm/glass/13.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/14.png b/assets/minecraft/mcpatcher/ctm/glass/14.png index a52467749..8eecc37ba 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/14.png and b/assets/minecraft/mcpatcher/ctm/glass/14.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/15.png b/assets/minecraft/mcpatcher/ctm/glass/15.png index 852c4806d..c5a3248a6 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/15.png and b/assets/minecraft/mcpatcher/ctm/glass/15.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/16.png b/assets/minecraft/mcpatcher/ctm/glass/16.png index db49da0a4..e9624f2b8 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/16.png and b/assets/minecraft/mcpatcher/ctm/glass/16.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/17.png b/assets/minecraft/mcpatcher/ctm/glass/17.png index 3c55e9cbd..3bc074104 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/17.png and b/assets/minecraft/mcpatcher/ctm/glass/17.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/18.png b/assets/minecraft/mcpatcher/ctm/glass/18.png index 14c659383..6909bc5b3 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/18.png and b/assets/minecraft/mcpatcher/ctm/glass/18.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/19.png b/assets/minecraft/mcpatcher/ctm/glass/19.png index f4dba95da..f8485a145 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/19.png and b/assets/minecraft/mcpatcher/ctm/glass/19.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/2.png b/assets/minecraft/mcpatcher/ctm/glass/2.png index c8b49a01b..0687af6c9 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/2.png and b/assets/minecraft/mcpatcher/ctm/glass/2.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/20.png b/assets/minecraft/mcpatcher/ctm/glass/20.png index d50a5ea0c..8717630ae 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/20.png and b/assets/minecraft/mcpatcher/ctm/glass/20.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/21.png b/assets/minecraft/mcpatcher/ctm/glass/21.png index 66f032961..2a21c3969 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/21.png and b/assets/minecraft/mcpatcher/ctm/glass/21.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/22.png b/assets/minecraft/mcpatcher/ctm/glass/22.png index 04f673571..69b363279 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/22.png and b/assets/minecraft/mcpatcher/ctm/glass/22.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/23.png b/assets/minecraft/mcpatcher/ctm/glass/23.png index b1bc2235e..9492db3d0 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/23.png and b/assets/minecraft/mcpatcher/ctm/glass/23.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/24.png b/assets/minecraft/mcpatcher/ctm/glass/24.png index 531018574..f603f16d2 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/24.png and b/assets/minecraft/mcpatcher/ctm/glass/24.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/25.png b/assets/minecraft/mcpatcher/ctm/glass/25.png index 1dc385f00..d449ccaea 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/25.png and b/assets/minecraft/mcpatcher/ctm/glass/25.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/26.png b/assets/minecraft/mcpatcher/ctm/glass/26.png index d3d62559d..5adac9ae5 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/26.png and b/assets/minecraft/mcpatcher/ctm/glass/26.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/27.png b/assets/minecraft/mcpatcher/ctm/glass/27.png index edd0f182c..5bd77d672 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/27.png and b/assets/minecraft/mcpatcher/ctm/glass/27.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/28.png b/assets/minecraft/mcpatcher/ctm/glass/28.png index efa2158c1..154494e52 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/28.png and b/assets/minecraft/mcpatcher/ctm/glass/28.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/29.png b/assets/minecraft/mcpatcher/ctm/glass/29.png index dac7ed0e7..7375f2fe1 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/29.png and b/assets/minecraft/mcpatcher/ctm/glass/29.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/3.png b/assets/minecraft/mcpatcher/ctm/glass/3.png index af88a7163..b1826bf92 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/3.png and b/assets/minecraft/mcpatcher/ctm/glass/3.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/30.png b/assets/minecraft/mcpatcher/ctm/glass/30.png index 6514354d8..285fce1dc 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/30.png and b/assets/minecraft/mcpatcher/ctm/glass/30.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/31.png b/assets/minecraft/mcpatcher/ctm/glass/31.png index eba3a489c..0832a0da4 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/31.png and b/assets/minecraft/mcpatcher/ctm/glass/31.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/32.png b/assets/minecraft/mcpatcher/ctm/glass/32.png index ab5fd8968..b9226c4af 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/32.png and b/assets/minecraft/mcpatcher/ctm/glass/32.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/33.png b/assets/minecraft/mcpatcher/ctm/glass/33.png index be6bfeed6..7d545e197 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/33.png and b/assets/minecraft/mcpatcher/ctm/glass/33.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/34.png b/assets/minecraft/mcpatcher/ctm/glass/34.png index ce78b9f8c..53d875bf7 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/34.png and b/assets/minecraft/mcpatcher/ctm/glass/34.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/35.png b/assets/minecraft/mcpatcher/ctm/glass/35.png index 675a78f97..6208945c0 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/35.png and b/assets/minecraft/mcpatcher/ctm/glass/35.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/36.png b/assets/minecraft/mcpatcher/ctm/glass/36.png index 1b5c50d82..3007a700b 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/36.png and b/assets/minecraft/mcpatcher/ctm/glass/36.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/37.png b/assets/minecraft/mcpatcher/ctm/glass/37.png index f79629d9d..85dab1ae8 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/37.png and b/assets/minecraft/mcpatcher/ctm/glass/37.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/38.png b/assets/minecraft/mcpatcher/ctm/glass/38.png index 21ee579a1..0e72f552c 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/38.png and b/assets/minecraft/mcpatcher/ctm/glass/38.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/39.png b/assets/minecraft/mcpatcher/ctm/glass/39.png index e7e2d7c0b..040c14cad 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/39.png and b/assets/minecraft/mcpatcher/ctm/glass/39.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/4.png b/assets/minecraft/mcpatcher/ctm/glass/4.png index 040650336..a1cd1bffd 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/4.png and b/assets/minecraft/mcpatcher/ctm/glass/4.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/40.png b/assets/minecraft/mcpatcher/ctm/glass/40.png index 9b083c71a..e2aefdd34 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/40.png and b/assets/minecraft/mcpatcher/ctm/glass/40.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/41.png b/assets/minecraft/mcpatcher/ctm/glass/41.png index 54220e172..94576f25e 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/41.png and b/assets/minecraft/mcpatcher/ctm/glass/41.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/42.png b/assets/minecraft/mcpatcher/ctm/glass/42.png index 647b26573..664d624c9 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/42.png and b/assets/minecraft/mcpatcher/ctm/glass/42.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/43.png b/assets/minecraft/mcpatcher/ctm/glass/43.png index a748f92c8..b227dfd3c 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/43.png and b/assets/minecraft/mcpatcher/ctm/glass/43.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/44.png b/assets/minecraft/mcpatcher/ctm/glass/44.png index 95ff4771c..d44b842d2 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/44.png and b/assets/minecraft/mcpatcher/ctm/glass/44.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/45.png b/assets/minecraft/mcpatcher/ctm/glass/45.png index 0d3a78440..0913a3b91 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/45.png and b/assets/minecraft/mcpatcher/ctm/glass/45.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/46.png b/assets/minecraft/mcpatcher/ctm/glass/46.png index 65a536031..8f1c3a1a5 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/46.png and b/assets/minecraft/mcpatcher/ctm/glass/46.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/5.png b/assets/minecraft/mcpatcher/ctm/glass/5.png index d37c64653..bb2a2aa22 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/5.png and b/assets/minecraft/mcpatcher/ctm/glass/5.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/6.png b/assets/minecraft/mcpatcher/ctm/glass/6.png index 85ff5d38e..1993c8cb4 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/6.png and b/assets/minecraft/mcpatcher/ctm/glass/6.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/7.png b/assets/minecraft/mcpatcher/ctm/glass/7.png index 3e61f2b69..53d18b97d 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/7.png and b/assets/minecraft/mcpatcher/ctm/glass/7.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/8.png b/assets/minecraft/mcpatcher/ctm/glass/8.png index a76fbfbc3..d2155e349 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/8.png and b/assets/minecraft/mcpatcher/ctm/glass/8.png differ diff --git a/assets/minecraft/mcpatcher/ctm/glass/9.png b/assets/minecraft/mcpatcher/ctm/glass/9.png index e6de18da4..965374fc2 100644 Binary files a/assets/minecraft/mcpatcher/ctm/glass/9.png and b/assets/minecraft/mcpatcher/ctm/glass/9.png differ diff --git a/assets/minecraft/mcpatcher/ctm/sandstone/0.png b/assets/minecraft/mcpatcher/ctm/sandstone/0.png new file mode 100644 index 000000000..bcd9673fb Binary files /dev/null and b/assets/minecraft/mcpatcher/ctm/sandstone/0.png differ diff --git a/assets/minecraft/textures/blocks/bookshelf.png b/assets/minecraft/textures/blocks/bookshelf.png index ee9827eed..06b671f22 100644 Binary files a/assets/minecraft/textures/blocks/bookshelf.png and b/assets/minecraft/textures/blocks/bookshelf.png differ diff --git a/assets/minecraft/textures/particle/cherry_0.png b/assets/minecraft/textures/particle/cherry_0.png new file mode 100644 index 000000000..e08302f6d Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_0.png differ diff --git a/assets/minecraft/textures/particle/cherry_1.png b/assets/minecraft/textures/particle/cherry_1.png new file mode 100644 index 000000000..f177a79ba Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_1.png differ diff --git a/assets/minecraft/textures/particle/cherry_10.png b/assets/minecraft/textures/particle/cherry_10.png new file mode 100644 index 000000000..142a14dd8 Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_10.png differ diff --git a/assets/minecraft/textures/particle/cherry_11.png b/assets/minecraft/textures/particle/cherry_11.png new file mode 100644 index 000000000..9d464ee92 Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_11.png differ diff --git a/assets/minecraft/textures/particle/cherry_2.png b/assets/minecraft/textures/particle/cherry_2.png new file mode 100644 index 000000000..cbed156ed Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_2.png differ diff --git a/assets/minecraft/textures/particle/cherry_3.png b/assets/minecraft/textures/particle/cherry_3.png new file mode 100644 index 000000000..521faaaef Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_3.png differ diff --git a/assets/minecraft/textures/particle/cherry_4.png b/assets/minecraft/textures/particle/cherry_4.png new file mode 100644 index 000000000..92e8706af Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_4.png differ diff --git a/assets/minecraft/textures/particle/cherry_5.png b/assets/minecraft/textures/particle/cherry_5.png new file mode 100644 index 000000000..499c1f773 Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_5.png differ diff --git a/assets/minecraft/textures/particle/cherry_6.png b/assets/minecraft/textures/particle/cherry_6.png new file mode 100644 index 000000000..b5ad049b6 Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_6.png differ diff --git a/assets/minecraft/textures/particle/cherry_7.png b/assets/minecraft/textures/particle/cherry_7.png new file mode 100644 index 000000000..49a70bc65 Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_7.png differ diff --git a/assets/minecraft/textures/particle/cherry_8.png b/assets/minecraft/textures/particle/cherry_8.png new file mode 100644 index 000000000..04c386945 Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_8.png differ diff --git a/assets/minecraft/textures/particle/cherry_9.png b/assets/minecraft/textures/particle/cherry_9.png new file mode 100644 index 000000000..1a9d522b4 Binary files /dev/null and b/assets/minecraft/textures/particle/cherry_9.png differ diff --git a/assets/miscutils/textures/gui/progressbar/fuel.png b/assets/miscutils/textures/gui/progressbar/fuel.png new file mode 100644 index 000000000..d00772843 Binary files /dev/null and b/assets/miscutils/textures/gui/progressbar/fuel.png differ diff --git a/assets/nei/textures/catalyst_tab.png b/assets/nei/textures/catalyst_tab.png index e9fc46611..44008517f 100644 Binary files a/assets/nei/textures/catalyst_tab.png and b/assets/nei/textures/catalyst_tab.png differ diff --git a/assets/nei/textures/gui/recipebg.png b/assets/nei/textures/gui/recipebg.png index a14bee9b1..251a14cdb 100644 Binary files a/assets/nei/textures/gui/recipebg.png and b/assets/nei/textures/gui/recipebg.png differ diff --git a/assets/tinker/textures/gui/generic.png b/assets/tinker/textures/gui/generic.png new file mode 100644 index 000000000..979406849 Binary files /dev/null and b/assets/tinker/textures/gui/generic.png differ diff --git a/assets/twilightforest/textures/blocks/time_clock.png b/assets/twilightforest/textures/blocks/time_clock.png new file mode 100644 index 000000000..61ebd7d45 Binary files /dev/null and b/assets/twilightforest/textures/blocks/time_clock.png differ diff --git a/pack.mcmeta b/pack.mcmeta index b77040320..f05df8cc2 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,13 +1,13 @@ { "pack": { "pack_format": 1, - "description": "§6GT New Horizons §bFaithful x32 §6By Ethryan §bv2.1.4 §r(53% done)" + "description": "§6GT New Horizons §bFaithful x32 §6By Ethryan §bv2.1.5 §r(53% done)" }, "gtnh_resource_pack_updater": { "schema": 1, "pack_name": "GTNH Faithful x32", "pack_version": "2.1.4", - "pack_game_version": "2.1.4", + "pack_game_version": "2.8.x", "source": { "type": "github_releases", "owner": "Ethryan",