diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml index 484293be..8cccdb30 100644 --- a/assets/tinker/lang/en_US.xml +++ b/assets/tinker/lang/en_US.xml @@ -150,8 +150,11 @@ Aluminum Nugget Fake Essence Crystal Aluminum Brass Nugget +<<<<<<< HEAD:assets/tinker/lang/en_US.xml Silky Cloth Silky Jewel +======= +>>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml Obsidian Nugget Cobalt Nugget Ardite Nugget @@ -159,8 +162,11 @@ Bronze Nugget Alumite Nugget Steel Nugget +<<<<<<< HEAD:assets/tinker/lang/en_US.xml Essence Crystal +======= +>>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml Smeltery Controller Smeltery Drain @@ -181,12 +187,15 @@ Drawbridge Igniter Landmine +<<<<<<< HEAD:assets/tinker/lang/en_US.xml Punji Stick Oak Barricade Spruce Barricade Birch Barricade Jungle Barricade Essence Extractor +======= +>>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml Block of Cobalt Block of Ardite diff --git a/assets/tinker/manuals/materials.xml b/assets/tinker/manuals/materials.xml index 4b45474d..728a434f 100644 --- a/assets/tinker/manuals/materials.xml +++ b/assets/tinker/manuals/materials.xml @@ -508,7 +508,8 @@ Class: Ranged Projectile Launcher Iron ironpick -A staple for tools, it can be refined and processed. +A staple for tools, it can be refined and processed. +- Requires the Smeltery
ironingot
@@ -553,7 +554,8 @@ Class: Ranged Projectile Launcher Alumite alumitepick -An uncommon alloy. It seems to be quite durable. +An uncommon alloy. It seems to be quite durable. +- Requires the Smeltery
alumiteingot
@@ -621,7 +623,8 @@ Class: Ranged Projectile Launcher Cobalt cobaltlongsword -One of the nether materials. It's bright blue. +One of the nether materials. It's bright blue. +- Requires the Smeltery
cobaltingot
@@ -630,7 +633,8 @@ Class: Ranged Projectile Launcher Ardite arditelongsword -One of the nether materials. It seems to mine faster as it wears out. +One of the nether materials. It seems to mine faster as it wears out. +- Requires the Smeltery
arditeingot
@@ -639,7 +643,8 @@ Class: Ranged Projectile Launcher Manyullyn manyullynlongsword -The nether alloy. It's stronger than diamond. +The nether alloy. It's stronger than diamond. +- Requires the Smeltery
manyullyningot
@@ -648,7 +653,8 @@ Class: Ranged Projectile Launcher Copper copperaxe -A common metal found in the ground. +A common metal found in the ground. +- Requires the Smeltery
copperingot
@@ -657,7 +663,8 @@ Class: Ranged Projectile Launcher Bronze bronzeaxe -A common alloy. It's a bit better than iron. +A common alloy. It's a bit better than iron. +- Requires the Smeltery
bronzeingot
@@ -666,7 +673,8 @@ Class: Ranged Projectile Launcher Steel steelsword -An Iron alloy. The method for obtaining this is unknown. Enemy chainmail seems to be made of it. +An Iron alloy. The method for obtaining this is unknown. Enemy chainmail seems to be made of it. +- Requires the Smeltery
steelingot
diff --git a/mods/WARGH.txt b/mods/WARGH.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/mods/tinker/textures/blocks/Landmine.png b/mods/tinker/textures/blocks/Landmine.png new file mode 100644 index 00000000..7859155d Binary files /dev/null and b/mods/tinker/textures/blocks/Landmine.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass.png b/mods/tinker/textures/blocks/glass/clear/glass.png new file mode 100644 index 00000000..d19a2acb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_d.png b/mods/tinker/textures/blocks/glass/clear/glass_1_d.png new file mode 100644 index 00000000..5dec6de4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_l.png b/mods/tinker/textures/blocks/glass/clear/glass_1_l.png new file mode 100644 index 00000000..077aa122 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_r.png b/mods/tinker/textures/blocks/glass/clear/glass_1_r.png new file mode 100644 index 00000000..0e856116 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_1_u.png b/mods/tinker/textures/blocks/glass/clear/glass_1_u.png new file mode 100644 index 00000000..5dd6bc0d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_dl.png b/mods/tinker/textures/blocks/glass/clear/glass_2_dl.png new file mode 100644 index 00000000..c3dc8478 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_dr.png b/mods/tinker/textures/blocks/glass/clear/glass_2_dr.png new file mode 100644 index 00000000..bd95cc03 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_h.png b/mods/tinker/textures/blocks/glass/clear/glass_2_h.png new file mode 100644 index 00000000..3f96317e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_ul.png b/mods/tinker/textures/blocks/glass/clear/glass_2_ul.png new file mode 100644 index 00000000..0fc8b250 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_ur.png b/mods/tinker/textures/blocks/glass/clear/glass_2_ur.png new file mode 100644 index 00000000..78f01305 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_2_v.png b/mods/tinker/textures/blocks/glass/clear/glass_2_v.png new file mode 100644 index 00000000..32b79772 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_d.png b/mods/tinker/textures/blocks/glass/clear/glass_3_d.png new file mode 100644 index 00000000..437408a1 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_l.png b/mods/tinker/textures/blocks/glass/clear/glass_3_l.png new file mode 100644 index 00000000..2751be8f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_r.png b/mods/tinker/textures/blocks/glass/clear/glass_3_r.png new file mode 100644 index 00000000..bf343351 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_3_u.png b/mods/tinker/textures/blocks/glass/clear/glass_3_u.png new file mode 100644 index 00000000..c572ca6a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/clear/glass_4.png b/mods/tinker/textures/blocks/glass/clear/glass_4.png new file mode 100644 index 00000000..86e8064b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/clear/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass.png b/mods/tinker/textures/blocks/glass/soul_clear/glass.png new file mode 100644 index 00000000..4aa7b3ff Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_d.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_d.png new file mode 100644 index 00000000..53e237d9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_l.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_l.png new file mode 100644 index 00000000..1d23b871 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_r.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_r.png new file mode 100644 index 00000000..e5458cec Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_1_u.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_u.png new file mode 100644 index 00000000..6f8f67bb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dl.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dl.png new file mode 100644 index 00000000..6e146e00 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dr.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dr.png new file mode 100644 index 00000000..127db342 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_h.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_h.png new file mode 100644 index 00000000..ad2aefc0 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ul.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ul.png new file mode 100644 index 00000000..86d0d593 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ur.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ur.png new file mode 100644 index 00000000..f62cc1ae Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_2_v.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_v.png new file mode 100644 index 00000000..f294245d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_d.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_d.png new file mode 100644 index 00000000..425d2513 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_l.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_l.png new file mode 100644 index 00000000..9c97772b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_r.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_r.png new file mode 100644 index 00000000..42b4b712 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_3_u.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_u.png new file mode 100644 index 00000000..8fa09e9d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/soul_clear/glass_4.png b/mods/tinker/textures/blocks/glass/soul_clear/glass_4.png new file mode 100644 index 00000000..86e8064b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soul_clear/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass.png b/mods/tinker/textures/blocks/glass/stained/black/glass.png new file mode 100644 index 00000000..2bfc485e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_d.png new file mode 100644 index 00000000..51834b3c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_l.png new file mode 100644 index 00000000..e0cc25d5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_r.png new file mode 100644 index 00000000..7096acb9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/black/glass_1_u.png new file mode 100644 index 00000000..02271f06 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_dl.png new file mode 100644 index 00000000..f6145d8d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_dr.png new file mode 100644 index 00000000..af7a5a7f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_h.png new file mode 100644 index 00000000..8e845802 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_ul.png new file mode 100644 index 00000000..5e157dfd Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_ur.png new file mode 100644 index 00000000..912e1923 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/black/glass_2_v.png new file mode 100644 index 00000000..174fdf7a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_d.png new file mode 100644 index 00000000..554e613f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_l.png new file mode 100644 index 00000000..11209f5e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_r.png new file mode 100644 index 00000000..454035fb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/black/glass_3_u.png new file mode 100644 index 00000000..afa59e37 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/black/glass_4.png b/mods/tinker/textures/blocks/glass/stained/black/glass_4.png new file mode 100644 index 00000000..4aca4a22 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/black/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass.png b/mods/tinker/textures/blocks/glass/stained/blue/glass.png new file mode 100644 index 00000000..9116a36d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_d.png new file mode 100644 index 00000000..4dba927e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_l.png new file mode 100644 index 00000000..13c04872 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_r.png new file mode 100644 index 00000000..0628bb63 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_u.png new file mode 100644 index 00000000..7c557864 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dl.png new file mode 100644 index 00000000..9ea68093 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dr.png new file mode 100644 index 00000000..896a452f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_h.png new file mode 100644 index 00000000..62f48ca4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png new file mode 100644 index 00000000..514d0ec7 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ur.png new file mode 100644 index 00000000..a1b9e7ee Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_v.png new file mode 100644 index 00000000..d28b2b35 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_d.png new file mode 100644 index 00000000..6f09e6a3 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_l.png new file mode 100644 index 00000000..24b885a2 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_r.png new file mode 100644 index 00000000..80a70bd4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_u.png new file mode 100644 index 00000000..1ca72fc6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/blue/glass_4.png b/mods/tinker/textures/blocks/glass/stained/blue/glass_4.png new file mode 100644 index 00000000..cd8fb9d5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/blue/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass.png b/mods/tinker/textures/blocks/glass/stained/brown/glass.png new file mode 100644 index 00000000..66bb5d3b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_d.png new file mode 100644 index 00000000..932fc322 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_l.png new file mode 100644 index 00000000..4626b76e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_r.png new file mode 100644 index 00000000..e8be00eb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_u.png new file mode 100644 index 00000000..7f91e053 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dl.png new file mode 100644 index 00000000..4b8044ee Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dr.png new file mode 100644 index 00000000..7019bc31 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_h.png new file mode 100644 index 00000000..be5cd766 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png new file mode 100644 index 00000000..c4dfea9b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ur.png new file mode 100644 index 00000000..4e0931c4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_v.png new file mode 100644 index 00000000..f4be2e2b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_d.png new file mode 100644 index 00000000..0d276995 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_l.png new file mode 100644 index 00000000..1e24a332 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_r.png new file mode 100644 index 00000000..5aad18d8 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_u.png new file mode 100644 index 00000000..20a11a1c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/brown/glass_4.png b/mods/tinker/textures/blocks/glass/stained/brown/glass_4.png new file mode 100644 index 00000000..b3d317a7 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/brown/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass.png new file mode 100644 index 00000000..924fb8a8 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png new file mode 100644 index 00000000..282802a6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_l.png new file mode 100644 index 00000000..fb3fb87b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png new file mode 100644 index 00000000..58899d7d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_u.png new file mode 100644 index 00000000..c045559d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dl.png new file mode 100644 index 00000000..13993b9f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dr.png new file mode 100644 index 00000000..b1007c99 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png new file mode 100644 index 00000000..6c1e76af Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png new file mode 100644 index 00000000..82332e62 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ur.png new file mode 100644 index 00000000..43b0c9d6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png new file mode 100644 index 00000000..ae05e56f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_d.png new file mode 100644 index 00000000..25e7cea9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png new file mode 100644 index 00000000..252dcb36 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_r.png new file mode 100644 index 00000000..d338c0ee Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png new file mode 100644 index 00000000..dbd57896 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/cyan/glass_4.png b/mods/tinker/textures/blocks/glass/stained/cyan/glass_4.png new file mode 100644 index 00000000..a2160882 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/cyan/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass.png b/mods/tinker/textures/blocks/glass/stained/gray/glass.png new file mode 100644 index 00000000..828eca1c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_d.png new file mode 100644 index 00000000..a36221ff Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_l.png new file mode 100644 index 00000000..4caaddb7 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_r.png new file mode 100644 index 00000000..2a2282bb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_u.png new file mode 100644 index 00000000..86b96fe9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dl.png new file mode 100644 index 00000000..207033d3 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dr.png new file mode 100644 index 00000000..d892f344 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_h.png new file mode 100644 index 00000000..39843475 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png new file mode 100644 index 00000000..c4f1d338 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ur.png new file mode 100644 index 00000000..115488cd Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_v.png new file mode 100644 index 00000000..e8c4a23c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_d.png new file mode 100644 index 00000000..d0e11e09 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_l.png new file mode 100644 index 00000000..79d4e8ad Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_r.png new file mode 100644 index 00000000..5915a6dd Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_u.png new file mode 100644 index 00000000..08d24efc Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/gray/glass_4.png b/mods/tinker/textures/blocks/glass/stained/gray/glass_4.png new file mode 100644 index 00000000..0c6d06d4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/gray/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass.png b/mods/tinker/textures/blocks/glass/stained/green/glass.png new file mode 100644 index 00000000..9cc66071 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_d.png new file mode 100644 index 00000000..88e32fc2 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_l.png new file mode 100644 index 00000000..91cba7e6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_r.png new file mode 100644 index 00000000..ff06b16e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/green/glass_1_u.png new file mode 100644 index 00000000..5b6d880c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_dl.png new file mode 100644 index 00000000..ce1553b6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_dr.png new file mode 100644 index 00000000..54ed8569 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_h.png new file mode 100644 index 00000000..5363339f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_ul.png new file mode 100644 index 00000000..3fde71a5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_ur.png new file mode 100644 index 00000000..f4076072 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/green/glass_2_v.png new file mode 100644 index 00000000..efb419b9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_d.png new file mode 100644 index 00000000..08a1815f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_l.png new file mode 100644 index 00000000..0ad4f56c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_r.png new file mode 100644 index 00000000..77e8d091 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/green/glass_3_u.png new file mode 100644 index 00000000..dcb63c93 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/green/glass_4.png b/mods/tinker/textures/blocks/glass/stained/green/glass_4.png new file mode 100644 index 00000000..82a6dfe2 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/green/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass.png new file mode 100644 index 00000000..ab875d1b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png new file mode 100644 index 00000000..226c6a6d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_l.png new file mode 100644 index 00000000..7b675271 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png new file mode 100644 index 00000000..6feb91ff Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_u.png new file mode 100644 index 00000000..314da07c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dl.png new file mode 100644 index 00000000..aa8d3028 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dr.png new file mode 100644 index 00000000..38f450f2 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png new file mode 100644 index 00000000..6a172b42 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png new file mode 100644 index 00000000..6c2057a5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ur.png new file mode 100644 index 00000000..825ea57b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png new file mode 100644 index 00000000..658dc221 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_d.png new file mode 100644 index 00000000..eafb911c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png new file mode 100644 index 00000000..18c9c64b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_r.png new file mode 100644 index 00000000..eac910d5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png new file mode 100644 index 00000000..1dc3f036 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_blue/glass_4.png b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_4.png new file mode 100644 index 00000000..36d7f920 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_blue/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass.png new file mode 100644 index 00000000..ac95a47f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png new file mode 100644 index 00000000..75e66bd5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_l.png new file mode 100644 index 00000000..3af84acb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png new file mode 100644 index 00000000..4ed4a4c4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_u.png new file mode 100644 index 00000000..233b4234 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dl.png new file mode 100644 index 00000000..073de069 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dr.png new file mode 100644 index 00000000..94ba0982 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png new file mode 100644 index 00000000..59158cf3 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png new file mode 100644 index 00000000..2a723dff Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ur.png new file mode 100644 index 00000000..d37b4e89 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png new file mode 100644 index 00000000..0a677c9e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_d.png new file mode 100644 index 00000000..b744df82 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png new file mode 100644 index 00000000..83e0b777 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_r.png new file mode 100644 index 00000000..d2515255 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png new file mode 100644 index 00000000..988dade5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/light_gray/glass_4.png b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_4.png new file mode 100644 index 00000000..6101f150 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/light_gray/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass.png b/mods/tinker/textures/blocks/glass/stained/lime/glass.png new file mode 100644 index 00000000..a32346e4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_d.png new file mode 100644 index 00000000..683c3d15 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_l.png new file mode 100644 index 00000000..2f39604f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_r.png new file mode 100644 index 00000000..70cbc11a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_u.png new file mode 100644 index 00000000..19beca01 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dl.png new file mode 100644 index 00000000..f66d25f0 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dr.png new file mode 100644 index 00000000..bea5fc2c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_h.png new file mode 100644 index 00000000..a884d4c4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png new file mode 100644 index 00000000..42f8acb8 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ur.png new file mode 100644 index 00000000..d1897364 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_v.png new file mode 100644 index 00000000..65c77fb4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_d.png new file mode 100644 index 00000000..6324c6fd Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_l.png new file mode 100644 index 00000000..e07a768a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_r.png new file mode 100644 index 00000000..e4bf8054 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_u.png new file mode 100644 index 00000000..c501379d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/lime/glass_4.png b/mods/tinker/textures/blocks/glass/stained/lime/glass_4.png new file mode 100644 index 00000000..376ed8bf Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/lime/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass.png new file mode 100644 index 00000000..1e57694c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png new file mode 100644 index 00000000..cf9da475 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_l.png new file mode 100644 index 00000000..388856f5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png new file mode 100644 index 00000000..a81b9a3a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_u.png new file mode 100644 index 00000000..ac79d7f5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dl.png new file mode 100644 index 00000000..0fcb2fe6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dr.png new file mode 100644 index 00000000..569ddf67 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png new file mode 100644 index 00000000..91e3c762 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png new file mode 100644 index 00000000..e5aa04ca Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ur.png new file mode 100644 index 00000000..7f46973d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png new file mode 100644 index 00000000..50501f89 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_d.png new file mode 100644 index 00000000..7998cd28 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png new file mode 100644 index 00000000..1dfbf63b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_r.png new file mode 100644 index 00000000..341e64a1 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png new file mode 100644 index 00000000..e9e4126d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/magenta/glass_4.png b/mods/tinker/textures/blocks/glass/stained/magenta/glass_4.png new file mode 100644 index 00000000..33786330 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/magenta/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass.png b/mods/tinker/textures/blocks/glass/stained/orange/glass.png new file mode 100644 index 00000000..97b30ea1 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_d.png new file mode 100644 index 00000000..78a96d3d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_l.png new file mode 100644 index 00000000..2813e261 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_r.png new file mode 100644 index 00000000..eca01a4a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_u.png new file mode 100644 index 00000000..5a492582 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dl.png new file mode 100644 index 00000000..86b18951 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dr.png new file mode 100644 index 00000000..6cc80f3d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_h.png new file mode 100644 index 00000000..3dfca38b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png new file mode 100644 index 00000000..96e80a03 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ur.png new file mode 100644 index 00000000..4b0c91da Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_v.png new file mode 100644 index 00000000..b96c8650 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_d.png new file mode 100644 index 00000000..38f52c12 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_l.png new file mode 100644 index 00000000..7b1f3016 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_r.png new file mode 100644 index 00000000..ab336a40 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_u.png new file mode 100644 index 00000000..d4742720 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/orange/glass_4.png b/mods/tinker/textures/blocks/glass/stained/orange/glass_4.png new file mode 100644 index 00000000..7b7cc745 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/orange/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass.png b/mods/tinker/textures/blocks/glass/stained/pink/glass.png new file mode 100644 index 00000000..ca12296d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_d.png new file mode 100644 index 00000000..07d1d87b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_l.png new file mode 100644 index 00000000..f0c21536 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_r.png new file mode 100644 index 00000000..72684b76 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_u.png new file mode 100644 index 00000000..b5bcbfb1 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dl.png new file mode 100644 index 00000000..0d3fedeb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dr.png new file mode 100644 index 00000000..6797f9ed Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_h.png new file mode 100644 index 00000000..193b0343 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png new file mode 100644 index 00000000..af0ccc20 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ur.png new file mode 100644 index 00000000..c84979f8 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_v.png new file mode 100644 index 00000000..39883a8e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_d.png new file mode 100644 index 00000000..13e67cb8 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_l.png new file mode 100644 index 00000000..78afde4a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_r.png new file mode 100644 index 00000000..0afe67e9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_u.png new file mode 100644 index 00000000..6926906f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/pink/glass_4.png b/mods/tinker/textures/blocks/glass/stained/pink/glass_4.png new file mode 100644 index 00000000..2fc8f490 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/pink/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass.png b/mods/tinker/textures/blocks/glass/stained/purple/glass.png new file mode 100644 index 00000000..a923aac6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_d.png new file mode 100644 index 00000000..f213d516 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_l.png new file mode 100644 index 00000000..05354b89 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_r.png new file mode 100644 index 00000000..3f5cbc4b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_u.png new file mode 100644 index 00000000..a674b38f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dl.png new file mode 100644 index 00000000..162f6bfe Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dr.png new file mode 100644 index 00000000..e6a1b214 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_h.png new file mode 100644 index 00000000..6b1a9b9a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png new file mode 100644 index 00000000..0f986ff2 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ur.png new file mode 100644 index 00000000..a661ec2d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_v.png new file mode 100644 index 00000000..be341cc7 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_d.png new file mode 100644 index 00000000..046b71d5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_l.png new file mode 100644 index 00000000..ff21907f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_r.png new file mode 100644 index 00000000..1442b5f9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_u.png new file mode 100644 index 00000000..bfa706fd Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/purple/glass_4.png b/mods/tinker/textures/blocks/glass/stained/purple/glass_4.png new file mode 100644 index 00000000..8a62e941 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/purple/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass.png b/mods/tinker/textures/blocks/glass/stained/red/glass.png new file mode 100644 index 00000000..cb2306e1 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_d.png new file mode 100644 index 00000000..e316697f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_l.png new file mode 100644 index 00000000..d3a820eb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_r.png new file mode 100644 index 00000000..c009e733 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/red/glass_1_u.png new file mode 100644 index 00000000..7dafbdf8 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_dl.png new file mode 100644 index 00000000..af15d5d0 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_dr.png new file mode 100644 index 00000000..7c5e70e5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_h.png new file mode 100644 index 00000000..8fc79b9f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_ul.png new file mode 100644 index 00000000..da9f4f86 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_ur.png new file mode 100644 index 00000000..82ed0ce4 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/red/glass_2_v.png new file mode 100644 index 00000000..57e5a19e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_d.png new file mode 100644 index 00000000..48e4f542 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_l.png new file mode 100644 index 00000000..a987dec0 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_r.png new file mode 100644 index 00000000..2d9acc6b Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/red/glass_3_u.png new file mode 100644 index 00000000..8b4591bd Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/red/glass_4.png b/mods/tinker/textures/blocks/glass/stained/red/glass_4.png new file mode 100644 index 00000000..db57cf67 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/red/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass.png b/mods/tinker/textures/blocks/glass/stained/white/glass.png new file mode 100644 index 00000000..2ef7a496 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_d.png new file mode 100644 index 00000000..59ec9b57 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_l.png new file mode 100644 index 00000000..c1fcd38d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_r.png new file mode 100644 index 00000000..bd98c8cd Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/white/glass_1_u.png new file mode 100644 index 00000000..f40cecdb Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_dl.png new file mode 100644 index 00000000..3c1c4be3 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_dr.png new file mode 100644 index 00000000..59115f0f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_h.png new file mode 100644 index 00000000..d6f9f7fc Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_ul.png new file mode 100644 index 00000000..57811583 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_ur.png new file mode 100644 index 00000000..6fc7f67f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/white/glass_2_v.png new file mode 100644 index 00000000..4e3fa4f6 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_d.png new file mode 100644 index 00000000..31913a33 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_l.png new file mode 100644 index 00000000..dcf80234 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_r.png new file mode 100644 index 00000000..2473ad90 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/white/glass_3_u.png new file mode 100644 index 00000000..fa8857c5 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/white/glass_4.png b/mods/tinker/textures/blocks/glass/stained/white/glass_4.png new file mode 100644 index 00000000..ca6bc049 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/white/glass_4.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass.png new file mode 100644 index 00000000..a0b7440c Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png new file mode 100644 index 00000000..3970a59e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_l.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_l.png new file mode 100644 index 00000000..e7b0d4a9 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png new file mode 100644 index 00000000..11ea672e Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_u.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_u.png new file mode 100644 index 00000000..9bb46774 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_1_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dl.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dl.png new file mode 100644 index 00000000..2f857534 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dl.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dr.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dr.png new file mode 100644 index 00000000..01cef7aa Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_dr.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png new file mode 100644 index 00000000..8142ab63 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_h.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png new file mode 100644 index 00000000..1e813a4f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ul.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ur.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ur.png new file mode 100644 index 00000000..442bec07 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_ur.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png new file mode 100644 index 00000000..9b68873a Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_2_v.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_d.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_d.png new file mode 100644 index 00000000..baf01ecf Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_d.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png new file mode 100644 index 00000000..cb911b96 Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_l.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_r.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_r.png new file mode 100644 index 00000000..da3d734f Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_r.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png new file mode 100644 index 00000000..5cd5235d Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_3_u.png differ diff --git a/mods/tinker/textures/blocks/glass/stained/yellow/glass_4.png b/mods/tinker/textures/blocks/glass/stained/yellow/glass_4.png new file mode 100644 index 00000000..72b4afef Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stained/yellow/glass_4.png differ diff --git a/mods/tinker/textures/blocks/liquid_electrum.png b/mods/tinker/textures/blocks/liquid_electrum.png new file mode 100644 index 00000000..817345f6 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_electrum.png differ diff --git a/mods/tinker/textures/blocks/liquid_electrum.txt b/mods/tinker/textures/blocks/liquid_electrum.txt new file mode 100644 index 00000000..b0a7c084 --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_electrum.txt @@ -0,0 +1,38 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +18*2 +17*2 +16*2 +15*2 +14*2 +13*2 +12*2 +11*2 +10*2 +9*2 +8*2 +7*2 +6*2 +5*2 +4*2 +3*2 +2*2 +1*2 diff --git a/mods/tinker/textures/blocks/liquid_electrum_flow.png b/mods/tinker/textures/blocks/liquid_electrum_flow.png new file mode 100644 index 00000000..aa63b513 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_electrum_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_electrum_flow.txt b/mods/tinker/textures/blocks/liquid_electrum_flow.txt new file mode 100644 index 00000000..2e6ca4fc --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_electrum_flow.txt @@ -0,0 +1,16 @@ +0*3 +1*3 +2*3 +3*3 +4*3 +5*3 +6*3 +7*3 +8*3 +9*3 +10*3 +11*3 +12*3 +13*3 +14*3 +15*3 diff --git a/mods/tinker/textures/blocks/liquid_ferrous.png b/mods/tinker/textures/blocks/liquid_ferrous.png new file mode 100644 index 00000000..7d917ffd Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_ferrous.png differ diff --git a/mods/tinker/textures/blocks/liquid_ferrous.txt b/mods/tinker/textures/blocks/liquid_ferrous.txt new file mode 100644 index 00000000..b0a7c084 --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_ferrous.txt @@ -0,0 +1,38 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +18*2 +17*2 +16*2 +15*2 +14*2 +13*2 +12*2 +11*2 +10*2 +9*2 +8*2 +7*2 +6*2 +5*2 +4*2 +3*2 +2*2 +1*2 diff --git a/mods/tinker/textures/blocks/liquid_ferrous_flow.png b/mods/tinker/textures/blocks/liquid_ferrous_flow.png new file mode 100644 index 00000000..1f641b56 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_ferrous_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_ferrous_flow.txt b/mods/tinker/textures/blocks/liquid_ferrous_flow.txt new file mode 100644 index 00000000..2e6ca4fc --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_ferrous_flow.txt @@ -0,0 +1,16 @@ +0*3 +1*3 +2*3 +3*3 +4*3 +5*3 +6*3 +7*3 +8*3 +9*3 +10*3 +11*3 +12*3 +13*3 +14*3 +15*3 diff --git a/mods/tinker/textures/blocks/liquid_invar.png b/mods/tinker/textures/blocks/liquid_invar.png new file mode 100644 index 00000000..2984f30e Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_invar.png differ diff --git a/mods/tinker/textures/blocks/liquid_invar.txt b/mods/tinker/textures/blocks/liquid_invar.txt new file mode 100644 index 00000000..b0a7c084 --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_invar.txt @@ -0,0 +1,38 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +18*2 +17*2 +16*2 +15*2 +14*2 +13*2 +12*2 +11*2 +10*2 +9*2 +8*2 +7*2 +6*2 +5*2 +4*2 +3*2 +2*2 +1*2 diff --git a/mods/tinker/textures/blocks/liquid_invar_flow.png b/mods/tinker/textures/blocks/liquid_invar_flow.png new file mode 100644 index 00000000..68321fab Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_invar_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_invar_flow.txt b/mods/tinker/textures/blocks/liquid_invar_flow.txt new file mode 100644 index 00000000..2e6ca4fc --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_invar_flow.txt @@ -0,0 +1,16 @@ +0*3 +1*3 +2*3 +3*3 +4*3 +5*3 +6*3 +7*3 +8*3 +9*3 +10*3 +11*3 +12*3 +13*3 +14*3 +15*3 diff --git a/mods/tinker/textures/blocks/liquid_lead.png b/mods/tinker/textures/blocks/liquid_lead.png new file mode 100644 index 00000000..448d1757 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_lead.png differ diff --git a/mods/tinker/textures/blocks/liquid_lead.txt b/mods/tinker/textures/blocks/liquid_lead.txt new file mode 100644 index 00000000..b0a7c084 --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_lead.txt @@ -0,0 +1,38 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +18*2 +17*2 +16*2 +15*2 +14*2 +13*2 +12*2 +11*2 +10*2 +9*2 +8*2 +7*2 +6*2 +5*2 +4*2 +3*2 +2*2 +1*2 diff --git a/mods/tinker/textures/blocks/liquid_lead_flow.png b/mods/tinker/textures/blocks/liquid_lead_flow.png new file mode 100644 index 00000000..7ec2852e Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_lead_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_lead_flow.txt b/mods/tinker/textures/blocks/liquid_lead_flow.txt new file mode 100644 index 00000000..2e6ca4fc --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_lead_flow.txt @@ -0,0 +1,16 @@ +0*3 +1*3 +2*3 +3*3 +4*3 +5*3 +6*3 +7*3 +8*3 +9*3 +10*3 +11*3 +12*3 +13*3 +14*3 +15*3 diff --git a/mods/tinker/textures/blocks/liquid_shiny.png b/mods/tinker/textures/blocks/liquid_shiny.png new file mode 100644 index 00000000..9c1ab339 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_shiny.png differ diff --git a/mods/tinker/textures/blocks/liquid_shiny.txt b/mods/tinker/textures/blocks/liquid_shiny.txt new file mode 100644 index 00000000..b0a7c084 --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_shiny.txt @@ -0,0 +1,38 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +18*2 +17*2 +16*2 +15*2 +14*2 +13*2 +12*2 +11*2 +10*2 +9*2 +8*2 +7*2 +6*2 +5*2 +4*2 +3*2 +2*2 +1*2 diff --git a/mods/tinker/textures/blocks/liquid_shiny_flow.png b/mods/tinker/textures/blocks/liquid_shiny_flow.png new file mode 100644 index 00000000..4b564dae Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_shiny_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_shiny_flow.txt b/mods/tinker/textures/blocks/liquid_shiny_flow.txt new file mode 100644 index 00000000..2e6ca4fc --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_shiny_flow.txt @@ -0,0 +1,16 @@ +0*3 +1*3 +2*3 +3*3 +4*3 +5*3 +6*3 +7*3 +8*3 +9*3 +10*3 +11*3 +12*3 +13*3 +14*3 +15*3 diff --git a/mods/tinker/textures/blocks/liquid_silver.png b/mods/tinker/textures/blocks/liquid_silver.png new file mode 100644 index 00000000..f669a50a Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_silver.png differ diff --git a/mods/tinker/textures/blocks/liquid_silver.txt b/mods/tinker/textures/blocks/liquid_silver.txt new file mode 100644 index 00000000..b0a7c084 --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_silver.txt @@ -0,0 +1,38 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +18*2 +17*2 +16*2 +15*2 +14*2 +13*2 +12*2 +11*2 +10*2 +9*2 +8*2 +7*2 +6*2 +5*2 +4*2 +3*2 +2*2 +1*2 diff --git a/mods/tinker/textures/blocks/liquid_silver_flow.png b/mods/tinker/textures/blocks/liquid_silver_flow.png new file mode 100644 index 00000000..7ac66ba5 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_silver_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_silver_flow.txt b/mods/tinker/textures/blocks/liquid_silver_flow.txt new file mode 100644 index 00000000..2e6ca4fc --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_silver_flow.txt @@ -0,0 +1,16 @@ +0*3 +1*3 +2*3 +3*3 +4*3 +5*3 +6*3 +7*3 +8*3 +9*3 +10*3 +11*3 +12*3 +13*3 +14*3 +15*3 diff --git a/mods/tinker/textures/gui/landmine.png b/mods/tinker/textures/gui/landmine.png new file mode 100644 index 00000000..1e881185 Binary files /dev/null and b/mods/tinker/textures/gui/landmine.png differ diff --git a/mods/tinker/textures/items/arrow/thuamium_arrow_shaft.png b/mods/tinker/textures/items/arrow/thaumium_arrow_shaft.png similarity index 100% rename from mods/tinker/textures/items/arrow/thuamium_arrow_shaft.png rename to mods/tinker/textures/items/arrow/thaumium_arrow_shaft.png diff --git a/mods/tinker/textures/items/materials/material_nugget_alumite.png b/mods/tinker/textures/items/materials/material_nugget_alumite.png new file mode 100644 index 00000000..4cad27ca Binary files /dev/null and b/mods/tinker/textures/items/materials/material_nugget_alumite.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_ardite.png b/mods/tinker/textures/items/materials/material_nugget_ardite.png new file mode 100644 index 00000000..f82ee499 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_nugget_ardite.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_bronze.png b/mods/tinker/textures/items/materials/material_nugget_bronze.png new file mode 100644 index 00000000..960ce169 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_nugget_bronze.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_cobalt.png b/mods/tinker/textures/items/materials/material_nugget_cobalt.png new file mode 100644 index 00000000..2907aeb5 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_nugget_cobalt.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_manyullyn.png b/mods/tinker/textures/items/materials/material_nugget_manyullyn.png new file mode 100644 index 00000000..c70ccaf9 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_nugget_manyullyn.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_obsidian.png b/mods/tinker/textures/items/materials/material_nugget_obsidian.png new file mode 100644 index 00000000..06a43ece Binary files /dev/null and b/mods/tinker/textures/items/materials/material_nugget_obsidian.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_steel.png b/mods/tinker/textures/items/materials/material_nugget_steel.png new file mode 100644 index 00000000..f216cfee Binary files /dev/null and b/mods/tinker/textures/items/materials/material_nugget_steel.png differ diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index 3b151099..618762e9 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -41,6 +41,7 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EnumCreatureType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -436,6 +437,10 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(redstoneMachine, RedstoneMachineItem.class, "Redstone.Machine"); GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge"); GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter"); + + landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("landmine"); + GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine"); + GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence"); GameRegistry.registerBlock(essenceExtractor, "extractor.essence"); @@ -1809,7 +1814,6 @@ public class TContent implements IFuelHandler "blueslime" }; for (int i = 0; i < matNames.length; i++) OreDictionary.registerOre(matNames[i] + "Rod", new ItemStack(toolRod, 1, i)); - String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; for (int i = 0; i < 16; i++) diff --git a/tconstruct/common/TProxyCommon.java b/tconstruct/common/TProxyCommon.java index 76ad6913..26d33222 100644 --- a/tconstruct/common/TProxyCommon.java +++ b/tconstruct/common/TProxyCommon.java @@ -52,6 +52,10 @@ public class TProxyCommon implements IGuiHandler if (ID < 0) return null; + + if (ID == landmineGui){ + return new ContainerLandmine(player, (TileEntityLandmine)world.getBlockTileEntity(x, y, z)); + } else if (ID < 100) { diff --git a/tconstruct/items/tools/LumberAxe.java b/tconstruct/items/tools/LumberAxe.java index e42439ce..60c3a58f 100644 --- a/tconstruct/items/tools/LumberAxe.java +++ b/tconstruct/items/tools/LumberAxe.java @@ -285,18 +285,18 @@ public class LumberAxe extends HarvestTool int meta = world.getBlockMetadata(xPos, yPos, zPos); int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); - if (hlvl <= tags.getInteger("HarvestLevel")) + if (block != null && block.blockMaterial == Material.wood) { - boolean cancelHarvest = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + if (hlvl <= tags.getInteger("HarvestLevel")) { - if (mod.beforeBlockBreak(this, stack, xPos, yPos, zPos, player)) - cancelHarvest = true; - } + boolean cancelHarvest = false; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + { + if (mod.beforeBlockBreak(this, stack, xPos, yPos, zPos, player)) + cancelHarvest = true; + } - if (!cancelHarvest) - { - if (block != null && block.blockMaterial == Material.wood) + if (!cancelHarvest) { world.setBlockToAir(xPos, yPos, zPos); if (!player.capabilities.isCreativeMode) diff --git a/tconstruct/modifiers/ModLapis.java b/tconstruct/modifiers/ModLapis.java index c247a92a..685b2526 100644 --- a/tconstruct/modifiers/ModLapis.java +++ b/tconstruct/modifiers/ModLapis.java @@ -114,7 +114,11 @@ public class ModLapis extends ToolMod List list = Arrays.asList(toolItem.toolCategories()); if (list.contains("weapon")) { - if (keyPair[0] >= 350) + if (keyPair[0] >= 450) + { + addEnchantment(tool, Enchantment.looting, 3); + } + else if (keyPair[0] >= 350) { int chance = keyPair[0] - 300; if (random.nextInt(1000 - chance) == 0) @@ -136,7 +140,11 @@ public class ModLapis extends ToolMod if (list.contains("harvest")) { - if (keyPair[0] >= 350) + if (keyPair[0] >= 450) + { + addEnchantment(tool, Enchantment.fortune, 3); + } + else if (keyPair[0] >= 350) { int chance = keyPair[0] - 300; if (random.nextInt(1000 - chance) == 0) diff --git a/tconstruct/modifiers/TActiveOmniMod.java b/tconstruct/modifiers/TActiveOmniMod.java index 9d1dd6c8..01810b6f 100644 --- a/tconstruct/modifiers/TActiveOmniMod.java +++ b/tconstruct/modifiers/TActiveOmniMod.java @@ -55,10 +55,7 @@ public class TActiveOmniMod extends ActiveToolMod { if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) return false; - - List list = Arrays.asList(tool.toolCategories()); - if (list.contains("harvest")) - TContent.modL.midStreamModify(stack, tool); + TContent.modL.midStreamModify(stack, tool); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = entity.worldObj; @@ -154,9 +151,7 @@ public class TActiveOmniMod extends ActiveToolMod @Override public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { - List list = Arrays.asList(tool.toolCategories()); - if (list.contains("weapon")) - TContent.modL.midStreamModify(stack, tool); + TContent.modL.midStreamModify(stack, tool); return 0; } diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java index 3fb8d4ae..a8aff134 100644 --- a/tconstruct/util/PHConstruct.java +++ b/tconstruct/util/PHConstruct.java @@ -68,6 +68,7 @@ public class PHConstruct harderBronze = config.get("Difficulty Changes", "Lower bronze output to 2 ingots", false).getBoolean(false); stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); + denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); blueSlime = config.get("Mob Spawning", "Activate Blue Slime Spawns", true).getBoolean(true); blueSlimeWeight = config.get("Mob Spawning", "Spawn Weight for Blue Slime", 6).getInt(6);