From 2c21f381ff64c85becef006bdb8a6e73b8949cf8 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Sun, 13 Oct 2019 20:46:24 +0200 Subject: Added logs to gitignore. Removed screenshots from gitignore. --- .gitignore | 2 +- .gradle/4.4.1/fileContent/fileContent.lock | Bin 17 -> 17 bytes .gradle/4.4.1/fileHashes/fileHashes.bin | Bin 86765 -> 86915 bytes .gradle/4.4.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .gradle/4.4.1/taskHistory/taskHistory.bin | Bin 230750 -> 251445 bytes .gradle/4.4.1/taskHistory/taskHistory.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 17 bytes screenshots/SOFC_Display.jpeg | Bin 0 -> 109788 bytes screenshots/TFFT_Display.jpeg | Bin 0 -> 74036 bytes src/main/java/kekztech/KekzCore.java | 3 +-- 10 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 screenshots/SOFC_Display.jpeg create mode 100644 screenshots/TFFT_Display.jpeg diff --git a/.gitignore b/.gitignore index db515e44c8..ef036dfea7 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,5 @@ hs_err_pid* /build/ /crash-reports/ /saves/ -/screenshots/ +/logs/ diff --git a/.gradle/4.4.1/fileContent/fileContent.lock b/.gradle/4.4.1/fileContent/fileContent.lock index 03d954d252..448a49c62b 100644 Binary files a/.gradle/4.4.1/fileContent/fileContent.lock and b/.gradle/4.4.1/fileContent/fileContent.lock differ diff --git a/.gradle/4.4.1/fileHashes/fileHashes.bin b/.gradle/4.4.1/fileHashes/fileHashes.bin index b5b7de791a..27622cf4f1 100644 Binary files a/.gradle/4.4.1/fileHashes/fileHashes.bin and b/.gradle/4.4.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.4.1/fileHashes/fileHashes.lock b/.gradle/4.4.1/fileHashes/fileHashes.lock index f64e50938a..4f62341bdb 100644 Binary files a/.gradle/4.4.1/fileHashes/fileHashes.lock and b/.gradle/4.4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.4.1/taskHistory/taskHistory.bin b/.gradle/4.4.1/taskHistory/taskHistory.bin index fd83e946c6..f5b48db8a3 100644 Binary files a/.gradle/4.4.1/taskHistory/taskHistory.bin and b/.gradle/4.4.1/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.4.1/taskHistory/taskHistory.lock b/.gradle/4.4.1/taskHistory/taskHistory.lock index 5100f82a59..744ca39a76 100644 Binary files a/.gradle/4.4.1/taskHistory/taskHistory.lock and b/.gradle/4.4.1/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b18ed64741..740a07c25b 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/screenshots/SOFC_Display.jpeg b/screenshots/SOFC_Display.jpeg new file mode 100644 index 0000000000..975f13e086 Binary files /dev/null and b/screenshots/SOFC_Display.jpeg differ diff --git a/screenshots/TFFT_Display.jpeg b/screenshots/TFFT_Display.jpeg new file mode 100644 index 0000000000..fc5c12c135 Binary files /dev/null and b/screenshots/TFFT_Display.jpeg differ diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index b449aaa85b..49238e6648 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -216,8 +216,7 @@ public class KekzCore { GT_Utility.getIntegratedCircuit(6), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 25), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RoseGold, 64), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Thorium, 12), + ItemList.Electric_Motor_EV.get(1L, (Object[]) null), ItemList.Field_Generator_HV.get(1L, (Object[]) null) }; GT_Values.RA.addAssemblerRecipe( -- cgit