diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .gradle/4.4.1/fileContent/fileContent.lock | bin | 17 -> 17 bytes | |||
| -rw-r--r-- | .gradle/4.4.1/fileHashes/fileHashes.bin | bin | 86765 -> 86915 bytes | |||
| -rw-r--r-- | .gradle/4.4.1/fileHashes/fileHashes.lock | bin | 17 -> 17 bytes | |||
| -rw-r--r-- | .gradle/4.4.1/taskHistory/taskHistory.bin | bin | 230750 -> 251445 bytes | |||
| -rw-r--r-- | .gradle/4.4.1/taskHistory/taskHistory.lock | bin | 17 -> 17 bytes | |||
| -rw-r--r-- | .gradle/buildOutputCleanup/buildOutputCleanup.lock | bin | 17 -> 17 bytes | |||
| -rw-r--r-- | screenshots/SOFC_Display.jpeg | bin | 0 -> 109788 bytes | |||
| -rw-r--r-- | screenshots/TFFT_Display.jpeg | bin | 0 -> 74036 bytes | |||
| -rw-r--r-- | src/main/java/kekztech/KekzCore.java | 3 |
10 files changed, 2 insertions, 3 deletions
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 Binary files differindex 03d954d252..448a49c62b 100644 --- a/.gradle/4.4.1/fileContent/fileContent.lock +++ b/.gradle/4.4.1/fileContent/fileContent.lock diff --git a/.gradle/4.4.1/fileHashes/fileHashes.bin b/.gradle/4.4.1/fileHashes/fileHashes.bin Binary files differindex b5b7de791a..27622cf4f1 100644 --- a/.gradle/4.4.1/fileHashes/fileHashes.bin +++ b/.gradle/4.4.1/fileHashes/fileHashes.bin diff --git a/.gradle/4.4.1/fileHashes/fileHashes.lock b/.gradle/4.4.1/fileHashes/fileHashes.lock Binary files differindex f64e50938a..4f62341bdb 100644 --- a/.gradle/4.4.1/fileHashes/fileHashes.lock +++ b/.gradle/4.4.1/fileHashes/fileHashes.lock diff --git a/.gradle/4.4.1/taskHistory/taskHistory.bin b/.gradle/4.4.1/taskHistory/taskHistory.bin Binary files differindex fd83e946c6..f5b48db8a3 100644 --- a/.gradle/4.4.1/taskHistory/taskHistory.bin +++ b/.gradle/4.4.1/taskHistory/taskHistory.bin diff --git a/.gradle/4.4.1/taskHistory/taskHistory.lock b/.gradle/4.4.1/taskHistory/taskHistory.lock Binary files differindex 5100f82a59..744ca39a76 100644 --- a/.gradle/4.4.1/taskHistory/taskHistory.lock +++ b/.gradle/4.4.1/taskHistory/taskHistory.lock diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock Binary files differindex b18ed64741..740a07c25b 100644 --- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock +++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock diff --git a/screenshots/SOFC_Display.jpeg b/screenshots/SOFC_Display.jpeg Binary files differnew file mode 100644 index 0000000000..975f13e086 --- /dev/null +++ b/screenshots/SOFC_Display.jpeg diff --git a/screenshots/TFFT_Display.jpeg b/screenshots/TFFT_Display.jpeg Binary files differnew file mode 100644 index 0000000000..fc5c12c135 --- /dev/null +++ b/screenshots/TFFT_Display.jpeg 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(
|
