From e47085d1eae7fcd3f1e858c67e75bb4ed936e351 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sun, 7 Apr 2019 07:08:39 +0200 Subject: Giant Materials/Space Compat update +added ASM +added a shit ton of materials and got my own Materials system up and running +added Ross128 when GC is installed Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 6e298a2662d8874903210037f7faa53d9aa83f40 --- build.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build.properties') diff --git a/build.properties b/build.properties index 72b745fd12..8045287543 100644 --- a/build.properties +++ b/build.properties @@ -22,9 +22,9 @@ mc_version=1.7.10 majorUpdate=0 -minorUpdate=3 -buildNumber=24 -APIVersion=4 +minorUpdate=4 +buildNumber=1 +APIVersion=5 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 gregtech.jenkinsbuild=143 \ No newline at end of file -- cgit From 5e7d6c24e5c0c4d799433a73abab6388a20bdd53 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sun, 7 Apr 2019 18:16:55 +0200 Subject: code clean up +made all asm patches disableable +removed secondary configs +added comments for config +fixed megas not working with more than one hatch Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 97c1b54ee17ec550c7cf03ddce0f5d9fd63bc688 --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.properties') diff --git a/build.properties b/build.properties index 8045287543..12d78ec78d 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=4 -buildNumber=1 +buildNumber=3 APIVersion=5 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 -- cgit From 913a24fa383a5beaad83f0a8f5eb04ea55385d62 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 8 Apr 2019 07:02:52 +0200 Subject: +added depts to build.grandle Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 8d24914f14b9b5dcb799bd337e9c870a7774fdf1 --- build.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build.properties') diff --git a/build.properties b/build.properties index 12d78ec78d..c81d017315 100644 --- a/build.properties +++ b/build.properties @@ -27,4 +27,6 @@ buildNumber=3 APIVersion=5 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 -gregtech.jenkinsbuild=143 \ No newline at end of file +gregtech.jenkinsbuild=143 +applecore.version=1.7.10-3.1.1 +galacticraft.version=1.7-3.0.12.504 \ No newline at end of file -- cgit From 267a494c3931c31bdcc5a3d11b743cc63e364750 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Tue, 9 Apr 2019 09:10:21 +0200 Subject: Ore Dict Support +Added Y/Th Glas +Added OreDict support for all Materials +Added an Internal Handler for Colors +Added Materials and improved Compability to GT and GT++ +Improved Code Quality of the BW Oregen Handler +Fixed NEI handler +Version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 5b189e2b4257f523efb5313038a2c25c0ea5d424 --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.properties') diff --git a/build.properties b/build.properties index c81d017315..8beb46ca1f 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=4 -buildNumber=3 +buildNumber=4 APIVersion=5 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 -- cgit From 05cea11a5d0be68f592e1c84d78487c0f8402133 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Thu, 11 Apr 2019 08:42:40 +0200 Subject: added debug log +added thaumcraft aspects for materials +refractored code +added a config option for the debug log +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 89fd58076774eee04d9aa677d22d48c039d1a06c --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.properties') diff --git a/build.properties b/build.properties index 8beb46ca1f..ab5c5addf1 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=4 -buildNumber=4 +buildNumber=5 APIVersion=5 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 -- cgit From c5f23f6dcfc44dacf907b19e09c67632b6f5aaa9 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Fri, 12 Apr 2019 16:50:30 +0200 Subject: Improved Threaded Loader +un-threaded GameRegistry stuff +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 6a1eb48d1e35e96f235ba5b743f7ce6d4cf33af5 --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.properties') diff --git a/build.properties b/build.properties index ab5c5addf1..3d69f35b15 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=4 -buildNumber=5 +buildNumber=6 APIVersion=5 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 -- cgit From c74b1a862d9935995f1a56e3a9061e2eb2a5aec6 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Fri, 12 Apr 2019 17:32:17 +0200 Subject: Fixed Heated Water Pump + will now drop its contents on removal + will no longer void non-burnable Items + Added ITileDropsContent for easy use + Pulled delSlot into its own Class + Created FuelSlot (a slot that will only accept burnable stacks) + API version increase + version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: bd948c36072c94e50c89213d233f9a718bb0a43b --- build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.properties') diff --git a/build.properties b/build.properties index 3d69f35b15..22690fd078 100644 --- a/build.properties +++ b/build.properties @@ -23,8 +23,8 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=4 -buildNumber=6 -APIVersion=5 +buildNumber=7 +APIVersion=6 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 gregtech.jenkinsbuild=143 -- cgit