From 945da14c4527c852dbfd6a3695522ac3428de11c Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 21 Jul 2020 11:43:06 -0500
Subject: [PATCH 1/4] Add melting and casting recipes for ambers

See #1535
---
 src/scripts/crafttweaker/modIntegrations/tinkers.zs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/scripts/crafttweaker/modIntegrations/tinkers.zs b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
index bd3f3f4f..efcbe48a 100644
--- a/src/scripts/crafttweaker/modIntegrations/tinkers.zs
+++ b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
@@ -100,6 +100,12 @@ function init() {
 	tinkers.addMelting(<liquid:bacon> * 1000, <sky_orchards:amber_bacon>);
 	tinkers.addMelting(<liquid:donut> * 1000, <sky_orchards:amber_donut>);
 	tinkers.addMelting(<liquid:bacon> * 250, <minecraft:porkchop>);
+  tinkers.addMelting(<liquid:quartz> * 1332, <sky_orchards:amber_quartz>);
+  tinkers.addMelting(<liquid:clay> * 576, <sky_orchards:amber_clay>);
+  tinkers.addMelting(<liquid:quartz> * 1332, <sky_orchards:amber_quartz>);
+  tinkers.addMelting(<liquid:diamond> * 666, <sky_orchards:amber_diamond>);
+  tinkers.addMelting(<liquid:emerald> * 666, <sky_orchards:amber_emerald>);
+  tinkers.addMelting(<liquid:lapis> * 5994, <sky_orchards:amber_lapis>);
 
 	//Cast Melting
 	tinkers.addMelting(<liquid:gold> * 288, <tconstruct:cast>);
@@ -145,6 +151,8 @@ function init() {
 	tinkers.addCastingTable(<tp:reinforced_obsidian_ingot>, <tconstruct:cast_custom>, <liquid:reinforced_obsidian>, 144, false, 200);
 	tinkers.addCastingTable(<sky_orchards:sapling_ardite>, <tconstruct:slime_sapling:2>, <liquid:ardite>, 144, true, 200);
 	tinkers.addCastingTable(<sky_orchards:sapling_cobalt>, <tconstruct:slime_sapling:1>, <liquid:cobalt>, 144, true, 200);
+  tinkers.addCastingTable(<minecraft:quartz>, <tconstruct:cast_custom:2>, <liquid:quartz>, 666, false, 200);
+  tinkers.addCastingTable(<minecraft:lapis_lazuli>, <tconstruct:cast_custom:2>, <liquid:lapis>, 666, false, 200);
 
 	//Ender Pearl and Seed Casting
 	tinkers.addCastingTable(<minecraft:ender_pearl>, <tconstruct:cast_custom:2>, <liquid:ender>, 250, false, 200);
@@ -202,6 +210,8 @@ function init() {
 	tinkers.addCastingBasin(<thermalfoundation:glass_alloy:7>, <minecraft:obsidian>, <liquid:enderium>, 144, true, 160);
 
 	tinkers.addCastingBasin(<minecraft:glowstone>, null, <liquid:glowstone>, 1000, true, 160);
+  tinkers.addCastingBasin(<minecraft:quartz_block>, null, <liquid:quartz>, 2664, true, 160);
+  tinkers.addCastingBasin(<minecraft:lapis_block>, null, <liquid:lapis>, 5994, true, 160);
 
 	//Casting liquid redstone into dust and blocks
 	tinkers.addCastingTable(<minecraft:redstone:0>, <tconstruct:cast_custom:2>, <liquid:redstone>, 100, false);

From f2b31e79f64b08ce1d053807ef25d159807ee938 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 21 Jul 2020 15:10:49 -0500
Subject: [PATCH 2/4] Add the option to melt Lapis Lazuli and Nether Quartz

---
 src/scripts/crafttweaker/modIntegrations/tinkers.zs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/scripts/crafttweaker/modIntegrations/tinkers.zs b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
index efcbe48a..7eacfdf0 100644
--- a/src/scripts/crafttweaker/modIntegrations/tinkers.zs
+++ b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
@@ -106,6 +106,10 @@ function init() {
   tinkers.addMelting(<liquid:diamond> * 666, <sky_orchards:amber_diamond>);
   tinkers.addMelting(<liquid:emerald> * 666, <sky_orchards:amber_emerald>);
   tinkers.addMelting(<liquid:lapis> * 5994, <sky_orchards:amber_lapis>);
+  tinkers.addMelting(<liquid:lapis> * 666, <minecraft:lapis_lazuli>);
+  tinkers.addMelting(<liquid:quartz> * 666, <minecraft:quartz>);
+
+
 
 	//Cast Melting
 	tinkers.addMelting(<liquid:gold> * 288, <tconstruct:cast>);

From ece08703bcc2f73503b9f2bf894506e398c47277 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 21 Jul 2020 15:25:30 -0500
Subject: [PATCH 3/4] Update Quartz Amber to match NuclearCraft

---
 .../crafttweaker/modIntegrations/tinkers.zs   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/scripts/crafttweaker/modIntegrations/tinkers.zs b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
index 7eacfdf0..a1028210 100644
--- a/src/scripts/crafttweaker/modIntegrations/tinkers.zs
+++ b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
@@ -100,14 +100,16 @@ function init() {
 	tinkers.addMelting(<liquid:bacon> * 1000, <sky_orchards:amber_bacon>);
 	tinkers.addMelting(<liquid:donut> * 1000, <sky_orchards:amber_donut>);
 	tinkers.addMelting(<liquid:bacon> * 250, <minecraft:porkchop>);
-  tinkers.addMelting(<liquid:quartz> * 1332, <sky_orchards:amber_quartz>);
-  tinkers.addMelting(<liquid:clay> * 576, <sky_orchards:amber_clay>);
-  tinkers.addMelting(<liquid:quartz> * 1332, <sky_orchards:amber_quartz>);
-  tinkers.addMelting(<liquid:diamond> * 666, <sky_orchards:amber_diamond>);
-  tinkers.addMelting(<liquid:emerald> * 666, <sky_orchards:amber_emerald>);
-  tinkers.addMelting(<liquid:lapis> * 5994, <sky_orchards:amber_lapis>);
-  tinkers.addMelting(<liquid:lapis> * 666, <minecraft:lapis_lazuli>);
-  tinkers.addMelting(<liquid:quartz> * 666, <minecraft:quartz>);
+  	tinkers.addMelting(<liquid:quartz> * 2664, <sky_orchards:amber_quartz>);
+  	tinkers.addMelting(<liquid:clay> * 576, <sky_orchards:amber_clay>);
+  	tinkers.addMelting(<liquid:quartz> * 1332, <sky_orchards:amber_quartz>);
+  	tinkers.addMelting(<liquid:diamond> * 666, <sky_orchards:amber_diamond>);
+  	tinkers.addMelting(<liquid:emerald> * 666, <sky_orchards:amber_emerald>);
+  	tinkers.addMelting(<liquid:lapis> * 5994, <sky_orchards:amber_lapis>);
+  
+  	// Gem melting
+  	tinkers.addMelting(<liquid:lapis> * 666, <minecraft:lapis_lazuli>);
+  	tinkers.addMelting(<liquid:quartz> * 666, <minecraft:quartz>);
 
 
 
@@ -155,8 +157,8 @@ function init() {
 	tinkers.addCastingTable(<tp:reinforced_obsidian_ingot>, <tconstruct:cast_custom>, <liquid:reinforced_obsidian>, 144, false, 200);
 	tinkers.addCastingTable(<sky_orchards:sapling_ardite>, <tconstruct:slime_sapling:2>, <liquid:ardite>, 144, true, 200);
 	tinkers.addCastingTable(<sky_orchards:sapling_cobalt>, <tconstruct:slime_sapling:1>, <liquid:cobalt>, 144, true, 200);
-  tinkers.addCastingTable(<minecraft:quartz>, <tconstruct:cast_custom:2>, <liquid:quartz>, 666, false, 200);
-  tinkers.addCastingTable(<minecraft:lapis_lazuli>, <tconstruct:cast_custom:2>, <liquid:lapis>, 666, false, 200);
+  	tinkers.addCastingTable(<minecraft:quartz>, <tconstruct:cast_custom:2>, <liquid:quartz>, 666, false, 200);
+  	tinkers.addCastingTable(<minecraft:lapis_lazuli>, <tconstruct:cast_custom:2>, <liquid:lapis>, 666, false, 200);
 
 	//Ender Pearl and Seed Casting
 	tinkers.addCastingTable(<minecraft:ender_pearl>, <tconstruct:cast_custom:2>, <liquid:ender>, 250, false, 200);

From 1820ce808ca38f2c22e5bd3621b2d717f2a928ef Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 21 Jul 2020 15:45:16 -0500
Subject: [PATCH 4/4] Make melting of Quartz and Lapis more general

Changed minecraft:quartz to ore:gemQuartz and minecraft:lapis_lazuli to ore:gemLapis
---
 src/scripts/crafttweaker/modIntegrations/tinkers.zs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/crafttweaker/modIntegrations/tinkers.zs b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
index a1028210..f65ec320 100644
--- a/src/scripts/crafttweaker/modIntegrations/tinkers.zs
+++ b/src/scripts/crafttweaker/modIntegrations/tinkers.zs
@@ -108,8 +108,8 @@ function init() {
   	tinkers.addMelting(<liquid:lapis> * 5994, <sky_orchards:amber_lapis>);
   
   	// Gem melting
-  	tinkers.addMelting(<liquid:lapis> * 666, <minecraft:lapis_lazuli>);
-  	tinkers.addMelting(<liquid:quartz> * 666, <minecraft:quartz>);
+  	tinkers.addMelting(<liquid:lapis> * 666, <ore:gemLapis>);
+  	tinkers.addMelting(<liquid:quartz> * 666, <ore:gemQuartz>);
 
 
 
@@ -216,8 +216,8 @@ function init() {
 	tinkers.addCastingBasin(<thermalfoundation:glass_alloy:7>, <minecraft:obsidian>, <liquid:enderium>, 144, true, 160);
 
 	tinkers.addCastingBasin(<minecraft:glowstone>, null, <liquid:glowstone>, 1000, true, 160);
-  tinkers.addCastingBasin(<minecraft:quartz_block>, null, <liquid:quartz>, 2664, true, 160);
-  tinkers.addCastingBasin(<minecraft:lapis_block>, null, <liquid:lapis>, 5994, true, 160);
+  	tinkers.addCastingBasin(<minecraft:quartz_block>, null, <liquid:quartz>, 2664, true, 160);
+  	tinkers.addCastingBasin(<minecraft:lapis_block>, null, <liquid:lapis>, 5994, true, 160);
 
 	//Casting liquid redstone into dust and blocks
 	tinkers.addCastingTable(<minecraft:redstone:0>, <tconstruct:cast_custom:2>, <liquid:redstone>, 100, false);