diff options
| author | kekzdealer <kekzdealer@gmail.com> | 2019-10-09 02:43:07 +0200 |
|---|---|---|
| committer | kekzdealer <kekzdealer@gmail.com> | 2019-10-09 02:43:07 +0200 |
| commit | 820ca984d2dea005a126ef585661503f8cc992f5 (patch) | |
| tree | bca38b81b17c435e493bf8030fad31ffe5d6d9bc | |
| parent | 187fbf985078ee89f12a287a6754f2023c5e16be (diff) | |
| download | GT5-Unofficial-820ca984d2dea005a126ef585661503f8cc992f5.tar.gz GT5-Unofficial-820ca984d2dea005a126ef585661503f8cc992f5.tar.bz2 GT5-Unofficial-820ca984d2dea005a126ef585661503f8cc992f5.zip | |
improved T.F.F.T code; Prepared for MultiHatch
107 files changed, 4075 insertions, 3734 deletions
diff --git a/.classpath b/.classpath index 956388a675..93ee7b3fb3 100644 --- a/.classpath +++ b/.classpath @@ -3,11 +3,12 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="src/main/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> - <classpathentry kind="lib" path="E:/Development/KekzTech/libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar"/> + <classpathentry kind="lib" path="/home/kekzdealer/eclipse-workspace/KekzTech/libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar"/> <classpathentry kind="lib" path="libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar"/> <classpathentry kind="lib" path="libs/gregtech-5.09.32-dev.jar" sourcepath="libs/gregtech-5.09.32-dev-src.zip"/> <classpathentry kind="lib" path="libs/industrialcraft-2-2.2.828a-experimental-deobf.jar"/> <classpathentry kind="lib" path="libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> + <classpathentry kind="lib" path="libs/joml-1.9.18.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/.directory b/.directory new file mode 100644 index 0000000000..5edbbd9d93 --- /dev/null +++ b/.directory @@ -0,0 +1,6 @@ +[Dolphin] +Timestamp=2019,10,7,18,33,15 +Version=4 + +[Settings] +HiddenFilesShown=true diff --git a/.gitignore b/.gitignore index 25baf5c841..09ea9d44f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,29 @@ -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -/bin/ -/build/ -/crash-reports/ -/saves/ -/screenshots/ - +# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+#*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/bin/
+/build/
+/crash-reports/
+/saves/
+/screenshots/
+
diff --git a/.gradle/2.0/taskArtifacts/cache.properties b/.gradle/2.0/taskArtifacts/cache.properties index 0a27f00048..68737acfa2 100644 --- a/.gradle/2.0/taskArtifacts/cache.properties +++ b/.gradle/2.0/taskArtifacts/cache.properties @@ -1 +1 @@ -#Sun Jun 09 22:52:57 CEST 2019 +#Sun Jun 09 22:52:57 CEST 2019
@@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>kekztech</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>kekztech</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
@@ -1,21 +1,21 @@ -MIT License - -Copyright (c) 2019 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT License
+
+Copyright (c) 2019
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -1,3 +1,3 @@ -# KekzTech -A Minecraft mod for the 1.7.10 modpack GTNH. -No compatibility outside GTNH guaranteed. +# KekzTech
+A Minecraft mod for the 1.7.10 modpack GTNH.
+No compatibility outside GTNH guaranteed.
diff --git a/config/CodeChickenLib.cfg b/config/CodeChickenLib.cfg index 94d4c170a5..947513c59e 100644 --- a/config/CodeChickenLib.cfg +++ b/config/CodeChickenLib.cfg @@ -3,6 +3,6 @@ dump_asm=true #Path to directory holding packaged.srg, fields.csv and methods.csv for mcp remapping -mappingDir=C:\Users\Kekzdealer\.gradle\caches\minecraft\net\minecraftforge\forge\1.7.10-10.13.4.1614-1.7.10\unpacked\conf +mappingDir=/home/kekzdealer/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/unpacked/conf textify=true diff --git a/config/GregTech/WorldGeneration.cfg b/config/GregTech/WorldGeneration.cfg index 9f8d5e493a..37781d6de8 100644 --- a/config/GregTech/WorldGeneration.cfg +++ b/config/GregTech/WorldGeneration.cfg @@ -2331,6 +2331,26 @@ worldgen { B:Overworld_true=true } + diamond { + B:Overworld_true=true + } + + naquadah { + B:Overworld_false=false + } + + coal { + B:Overworld_true=true + } + + uranium { + B:Overworld_true=true + } + + soapstone { + B:Overworld_true=true + } + } small { diff --git a/config/IC2.ini b/config/IC2.ini index c526d786f2..e90cb15b5d 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,168 +1,168 @@ -; ic2 general config
-; created Jul 4, 2019 5:21:42 PM
-;---
-
-[worldgen]
-; Enable generation of rubber trees in the world.
-rubberTree = true
-; Enable generation of copper in the world.
-copperOre = true
-; Enable generation of tin in the world.
-tinOre = true
-; Enable generation of uranium in the world.
-uraniumOre = true
-; Enable generation of Lead in the world.
-leadOre = true
-; Factor scaling the IC2 ore generation quantity.
-oreDensityFactor = 1.0
-
-[protection]
-; Enable logging of players when they remove a machine using a wrench.
-wrenchLogging = true
-; Maximum Explosion power of a nuke, where TNT is 4.
-nukeExplosionPowerLimit = 60
-; Maximum explosion power of a nuclear reactor, where TNT is 4.
-reactorExplosionPowerLimit = 45
-; Enable the nuke
-enableNuke = true
-
-[balance]
-; Maximum battery tier usable by the miner.
-; 1 = batteries, 2 = lead batteries, 3 = energy crystals, 4 = lapotron crystals
-minerDischargeTier = 1
-; Increase the energy use by the player's inventory weight when going through a teleporter.
-teleporterUseInventoryWeight = true
-; Ratio of energy retained inside energy storage block Items when wrenched.
-; 0 (nothing) ... 1 (100%), default 0.8 (80 %)
-energyRetainedInStorageBlockDrops = 0.8
-; Factor to scale the UU-Matter production energy requirement.
-uuEnergyFactor = 1.0
-; Disable the vanilla ender chest, removing existing ones from the world as well.
-disableEnderChest = false
-; Comma separated list of blocks and items which should not be turned into scrap by the recycler.
-; Format: <name>[@metadata], metadata * matches any.
-; Ore dictionary entries can be specified with OreDict:<ore dict name> as the name.
-recyclerBlacklist = minecraft:glass_pane, minecraft:stick, minecraft:snowball, minecraft:snow_layer, minecraft:snow, IC2:blockScaffold
-; Whitelist for blocks/items allowed to be recycled.
-; The whitelist will be used instead of the blacklist approach if it's non-empty, disallowing everything else.
-; The format is the same as the blacklist.
-recyclerWhitelist =
-; Allow to pick blocks up using just a pickaxe instead of needing a wrench.
-ignoreWrenchRequirement = false
-
-; Base energy generation factors - increase for higher energy yield.
-[balance / energy / generator]
-generator = 1.0
-geothermal = 1.0
-; Deprecated, because of Kinetic Watermill
-water = 1.0
-solar = 1.0
-; Deprecated, because of Kinetic Windmill
-wind = 1.0
-nuclear = 1.0
-semiFluidOil = 1.0
-semiFluidFuel = 1.0
-semiFluidBiomass = 1.0
-semiFluidBioethanol = 1.0
-semiFluidBiogas = 1.0
-Stirling = 1.0
-Kinetic = 1.0
-radioisotope = 1.0
-
-; Base heat generation factors - increase for higher heat yield.
-[balance / energy / heatgenerator]
-semiFluidOil = 1.0
-semiFluidFuel = 1.0
-semiFluidBiomass = 1.0
-semiFluidBioethanol = 1.0
-semiFluidBiogas = 1.0
-solid = 1.0
-radioisotope = 1.0
-electric = 1.0
-
-; Base kinetic generation factors - increase for higher kinetic energy yield.
-[balance / energy / kineticgenerator]
-water = 1.0
-wind = 1.0
-manual = 1.0
-steam = 1.0
-electric = 1.0
|