From ce3fb9fcd200e49d8504d7e85da00edf2eeac4fb Mon Sep 17 00:00:00 2001 From: Tec Date: Mon, 7 Feb 2022 19:28:34 +0100 Subject: Revert "Cleanup master dependencies" This reverts commit 527bac2a9c75b0aa57eaf7540e4b046bab68d913. (cherry picked from commit ef47ffd57dc4697aee7f5db7ac4c65c5e0780efb) --- dependencies.gradle | 17 +++++++++++------ dependencies/AdvancedSolarPanel_1.7.10_Edition.jar | Bin 0 -> 305650 bytes dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar | Bin 0 -> 1461467 bytes 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 dependencies/AdvancedSolarPanel_1.7.10_Edition.jar create mode 100644 dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar diff --git a/dependencies.gradle b/dependencies.gradle index dca1d2612f..ed933b256e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -19,25 +19,30 @@ dependencies { transitive = false }*/ - compileOnly("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") { + compile("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") { transitive = false } - compileOnly("dan200.computercraft:ComputerCraft:1.75") { + compile("dan200.computercraft:ComputerCraft:1.75") { transitive = false } - compileOnly("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") { + compile("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") { transitive = false } - compileOnly("curse.maven:cofh-core-69162:2388751") { + compile("curse.maven:cofh-core-69162:2388751") { transitive = false } - compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { + compile("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { + transitive = false + } + compile("com.azanor.baubles:Baubles:1.0.1.10:deobf") { transitive = false } - compileOnly files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar") + compile files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar") + compile files("dependencies/AdvancedSolarPanel_1.7.10_Edition.jar") + compile files("dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar") } diff --git a/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar b/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar new file mode 100644 index 0000000000..dfd00eb958 Binary files /dev/null and b/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar differ diff --git a/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar b/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar new file mode 100644 index 0000000000..0361359748 Binary files /dev/null and b/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar differ -- cgit From 7ececfd550811df03dbf27a9c4e74ebbc16dd247 Mon Sep 17 00:00:00 2001 From: Tec Date: Wed, 2 Feb 2022 17:38:28 +0100 Subject: Add world edit cui (cherry picked from commit 719fdf6f550c0ab9c69eedefed55aefbf5a07187) (cherry picked from commit 26559493eb8460c5d32f577d7d7fa9733155c631) --- dependencies.gradle | 1 + .../WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar | Bin 0 -> 93851 bytes 2 files changed, 1 insertion(+) create mode 100644 dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar diff --git a/dependencies.gradle b/dependencies.gradle index ed933b256e..93623cd034 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -45,4 +45,5 @@ dependencies { compile files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar") compile files("dependencies/AdvancedSolarPanel_1.7.10_Edition.jar") compile files("dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar") + compile files("dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar") } diff --git a/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar b/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar new file mode 100644 index 0000000000..2891f1480f Binary files /dev/null and b/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar differ -- cgit From 1ab42dac8989254301bfc3747ceccb4ab8b17ca6 Mon Sep 17 00:00:00 2001 From: Tec Date: Mon, 7 Feb 2022 19:38:46 +0100 Subject: Change GT++ version (cherry picked from commit 5bd1be82b8a4004f0d26cc41d4f1f1c10c2ef7a1) --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 93623cd034..378b7401b9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -19,7 +19,7 @@ dependencies { transitive = false }*/ - compile("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") { + compile("com.github.GTNewHorizons:GTplusplus:1.7.27:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") { -- cgit