diff options
| author | kekzdealer <kekzdealer@gmail.com> | 2019-10-11 02:29:41 +0200 |
|---|---|---|
| committer | kekzdealer <kekzdealer@gmail.com> | 2019-10-11 02:29:41 +0200 |
| commit | 95ae4bcb0146fbccb6eaf0f0b3477050b8dde533 (patch) | |
| tree | a56a19af59207ad07fef7aafdeefa5f4e6d76fa4 | |
| parent | bee1facd1b8e78d4ef734a7b1986276133e9e980 (diff) | |
| download | GT5-Unofficial-95ae4bcb0146fbccb6eaf0f0b3477050b8dde533.tar.gz GT5-Unofficial-95ae4bcb0146fbccb6eaf0f0b3477050b8dde533.tar.bz2 GT5-Unofficial-95ae4bcb0146fbccb6eaf0f0b3477050b8dde533.zip | |
Fixed TFFT persistency. Made TFFT storage more expensive. Added Multi Hatch recipe. Increased version #. Perparing for release.
140 files changed, 326 insertions, 242 deletions
diff --git a/.gradle/4.4.1/fileChanges/last-build.bin b/.gradle/4.4.1/fileChanges/last-build.bin Binary files differnew file mode 100644 index 0000000000..f76dd238ad --- /dev/null +++ b/.gradle/4.4.1/fileChanges/last-build.bin diff --git a/.gradle/4.4.1/fileContent/annotation-processors.bin b/.gradle/4.4.1/fileContent/annotation-processors.bin Binary files differnew file mode 100644 index 0000000000..bf4a1e62a8 --- /dev/null +++ b/.gradle/4.4.1/fileContent/annotation-processors.bin diff --git a/.gradle/4.4.1/fileContent/fileContent.lock b/.gradle/4.4.1/fileContent/fileContent.lock Binary files differnew file mode 100644 index 0000000000..914f184b18 --- /dev/null +++ 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 differnew file mode 100644 index 0000000000..dde1de976c --- /dev/null +++ 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 differnew file mode 100644 index 0000000000..e38ad2694c --- /dev/null +++ b/.gradle/4.4.1/fileHashes/fileHashes.lock diff --git a/.gradle/4.4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.4.1/fileHashes/resourceHashesCache.bin Binary files differnew file mode 100644 index 0000000000..d6817bf881 --- /dev/null +++ b/.gradle/4.4.1/fileHashes/resourceHashesCache.bin diff --git a/.gradle/4.4.1/taskHistory/taskHistory.bin b/.gradle/4.4.1/taskHistory/taskHistory.bin Binary files differnew file mode 100644 index 0000000000..6c54c2cf09 --- /dev/null +++ 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 differnew file mode 100644 index 0000000000..2af254906c --- /dev/null +++ b/.gradle/4.4.1/taskHistory/taskHistory.lock diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock Binary files differnew file mode 100644 index 0000000000..889f5acb66 --- /dev/null +++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000000..d32ed2b7bd --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Fri Oct 11 01:00:16 CEST 2019 +gradle.version=4.4.1 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin Binary files differnew file mode 100644 index 0000000000..d481035b39 --- /dev/null +++ b/.gradle/buildOutputCleanup/outputFiles.bin diff --git a/GregTech.lang b/GregTech.lang index ab5f26fc5d..f7518d06ad 100644 --- a/GregTech.lang +++ b/GregTech.lang @@ -923,6 +923,65 @@ languagefile { S:TileEntity_DESCRIPTION_130_Index_2=Size(WxHxD): 3x4x3 (Hollow, with opening on top) S:TileEntity_DESCRIPTION_130_Index_3=Built from 32 Firebrick blocks S:TileEntity_DESCRIPTION_130_Index_4=Causes 50 Pollution per second + S:TileEntity_DESCRIPTION_13101_Index_0=Oxidizes gas fuels to generate electricity without polluting the environment + S:TileEntity_DESCRIPTION_13101_Index_1=Consumes 29,480EU worth of fuel with up to 97% efficiency each second + S:TileEntity_DESCRIPTION_13101_Index_10= 3x YSZ Ceramic Electrolyte Unit: Center 1x1x3 + S:TileEntity_DESCRIPTION_13101_Index_11= 12x Clean Stainless Steel Machine Casing (at least) + S:TileEntity_DESCRIPTION_13101_Index_12= 6x Reinforced Glass: Touching the Electrolyte Units on the horizontal sides + S:TileEntity_DESCRIPTION_13101_Index_13= Maintenance Hatch, I/O Hatches: Instead of any casing + S:TileEntity_DESCRIPTION_13101_Index_2=Steam production requires the SOFC to heat up completely first + S:TileEntity_DESCRIPTION_13101_Index_3=Outputs 1024EU/t and 900L/t Steam + S:TileEntity_DESCRIPTION_13101_Index_4=Additionally requires 20L/t Oxygen gas + S:TileEntity_DESCRIPTION_13101_Index_5=------------------------------------------ + S:TileEntity_DESCRIPTION_13101_Index_6=Dimensions: 3x3x5 (WxHxL) + S:TileEntity_DESCRIPTION_13101_Index_7=Structure: + S:TileEntity_DESCRIPTION_13101_Index_8= Controller: Front center + S:TileEntity_DESCRIPTION_13101_Index_9= Dynamo Hatch: Back center + S:TileEntity_DESCRIPTION_13102_Index_0=Oxidizes gas fuels to generate electricity without polluting the environment + S:TileEntity_DESCRIPTION_13102_Index_1=Consumes 442,200EU worth of fuel with up to 160% efficiency each second + S:TileEntity_DESCRIPTION_13102_Index_10= 3x GDC Ceramic Electrolyte Unit (center 1x1x3) + S:TileEntity_DESCRIPTION_13102_Index_11= 12x Robust Tungstensteel Machine Casing (at least) + S:TileEntity_DESCRIPTION_13102_Index_12= 6x Reinforced Glass: Touching the Electrolyte Units on the horizontal sides + S:TileEntity_DESCRIPTION_13102_Index_13= Maintenance Hatch, I/O Hatches: Instead of any casing + S:TileEntity_DESCRIPTION_13102_Index_2=Steam production requires the SOFC to heat up completely first + S:TileEntity_DESCRIPTION_13102_Index_3=Outputs 24576EU/t and 4800L/t Superheated Steam + S:TileEntity_DESCRIPTION_13102_Index_4=Additionally requires 100L/t Oxygen gas + S:TileEntity_DESCRIPTION_13102_Index_5=------------------------------------------ + S:TileEntity_DESCRIPTION_13102_Index_6=Dimensions: 3x3x5 (WxHxL) + S:TileEntity_DESCRIPTION_13102_Index_7=Structure: + S:TileEntity_DESCRIPTION_13102_Index_8= Controller front center + S:TileEntity_DESCRIPTION_13102_Index_9= Dynamo Hatch back center + S:TileEntity_DESCRIPTION_13103_Index_0=DO NOT CHEAT IN THIS MACHINE + S:TileEntity_DESCRIPTION_13103_Index_1=I'm not quite finished yet + S:TileEntity_DESCRIPTION_13103_Index_2=------------------------------------------ + S:TileEntity_DESCRIPTION_13103_Index_3=Dimensions: 5x5x5 (WxHxL) + S:TileEntity_DESCRIPTION_13103_Index_4=Structure: + S:TileEntity_DESCRIPTION_13103_Index_5= Controller: Front center + S:TileEntity_DESCRIPTION_13103_Index_6= 80x Radiation Proof Machine Casing (at least) + S:TileEntity_DESCRIPTION_13103_Index_7= Dynamo Hatch: ONLY in EU-mode, at least one + S:TileEntity_DESCRIPTION_13103_Index_8= Input Bus, Output Bus: Optional but required for automation + S:TileEntity_DESCRIPTION_13103_Index_9= Input Hatch, Output Hatch: ONLY in Coolant-Mode, at least one each + S:TileEntity_DESCRIPTION_13104_Index_0=High-Tech fluid tank that can hold up to 25 different fluids + S:TileEntity_DESCRIPTION_13104_Index_1=Has 1/25th of the total capacity as capacity for each fluid + S:TileEntity_DESCRIPTION_13104_Index_10=Use an integrated circuit in the GUI slot to limit which fluid is outputted + S:TileEntity_DESCRIPTION_13104_Index_11=The number of a stored fluid can be obtained through the Tricorder. + S:TileEntity_DESCRIPTION_13104_Index_12=------------------------------------------ + S:TileEntity_DESCRIPTION_13104_Index_13=Dimensions: 5x9x5 (WxHxL) + S:TileEntity_DESCRIPTION_13104_Index_14=Structure: + S:TileEntity_DESCRIPTION_13104_Index_15= Controller: Top center + S:TileEntity_DESCRIPTION_13104_Index_16= Energy Hatch: Any top or bottom casing + S:TileEntity_DESCRIPTION_13104_Index_17= Inner 3x7x3 tube are Storage Field Blocks + S:TileEntity_DESCRIPTION_13104_Index_18= Outer 5x7x5 glass shell is AE2 Quartz Glass or Vanilla Stained Glass + S:TileEntity_DESCRIPTION_13104_Index_19= Maintenance Hatch: Any top or bottom casing + S:TileEntity_DESCRIPTION_13104_Index_2=Rightclicking the controller with a screwdriver will turn on excess voiding + S:TileEntity_DESCRIPTION_13104_Index_20= I/O Hatches: Instead of any casing or glass, have to touch storage field + S:TileEntity_DESCRIPTION_13104_Index_3=Fluid storage amount and running cost depends on the storage field blocks used + S:TileEntity_DESCRIPTION_13104_Index_4=Tier I: 500,000L per block, 0.5EU/t + S:TileEntity_DESCRIPTION_13104_Index_5=Tier II: 4,000,000L per block, 1EU/t + S:TileEntity_DESCRIPTION_13104_Index_6=Tier III: 16,000,000L per block, 2EU/t + S:TileEntity_DESCRIPTION_13104_Index_7=Tier IV: 64,000,000L per block, 4EU/t + S:TileEntity_DESCRIPTION_13104_Index_8=------------------------------------------ + S:TileEntity_DESCRIPTION_13104_Index_9=Note on hatch locking: S:TileEntity_DESCRIPTION_1310_Index_0=Max Voltage: %s S:TileEntity_DESCRIPTION_1310_Index_1=Max Amperage: %s S:TileEntity_DESCRIPTION_1310_Index_2=Loss/Meter/Ampere: %s EU-Volt diff --git a/config/GregTech/Recipes.cfg b/config/GregTech/Recipes.cfg index d15efea11c..0441cbeb13 100644 --- a/config/GregTech/Recipes.cfg +++ b/config/GregTech/Recipes.cfg @@ -4702,6 +4702,8 @@ assembling { I:tile.jukebox_400=400 I:tile.kekztech_gdcceramicelectrolyteunit_block_2400=2400 I:tile.kekztech_tfftcasing_block_200=200 + I:tile.kekztech_tfftcasingblock_block_200=200 + I:tile.kekztech_tfftmultihatch_block_6000=6000 I:tile.kekztech_tfftstoragefieldblock1_block_200=200 I:tile.kekztech_tfftstoragefieldblock2_block_200=200 I:tile.kekztech_tfftstoragefieldblock3_block_300=300 diff --git a/config/IC2.ini b/config/IC2.ini index b22fa00f9f..34e97e643d 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config -; created Oct 10, 2019 4:06:49 AM +; created Oct 11, 2019 2:18:17 AM ;--- [worldgen] diff --git a/config/splash.properties b/config/splash.properties index 6ae82a8b9c..966b9ae3b6 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Thu Oct 10 04:06:42 CEST 2019 +#Fri Oct 11 02:18:09 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/logs/2019-05-20-1.log.gz b/logs/2019-05-20-1.log.gz Binary files differdeleted file mode 100644 index 643029d0a3..0000000000 --- a/logs/2019-05-20-1.log.gz +++ /dev/null diff --git a/logs/2019-05-20-2.log.gz b/logs/2019-05-20-2.log.gz Binary files differdeleted file mode 100644 index 56847b14d3..0000000000 --- a/logs/2019-05-20-2.log.gz +++ /dev/null diff --git a/logs/2019-05-20-3.log.gz b/logs/2019-05-20-3.log.gz Binary files differdeleted file mode 100644 index 846a643bc4..0000000000 --- a/logs/2019-05-20-3.log.gz +++ /dev/null diff --git a/logs/2019-05-20-4.log.gz b/logs/2019-05-20-4.log.gz Binary files differdeleted file mode 100644 index 189a770071..0000000000 --- a/logs/2019-05-20-4.log.gz +++ /dev/null diff --git a/logs/2019-05-20-5.log.gz b/logs/2019-05-20-5.log.gz Binary files differdeleted file mode 100644 index 0a383a65f8..0000000000 --- a/logs/2019-05-20-5.log.gz +++ /dev/null diff --git a/logs/2019-05-28-1.log.gz b/logs/2019-05-28-1.log.gz Binary files differdeleted file mode 100644 index d073d2f814..0000000000 --- a/logs/2019-05-28-1.log.gz +++ /dev/null diff --git a/logs/2019-05-28-2.log.gz b/logs/2019-05-28-2.log.gz Binary files differdeleted file mode 100644 index 21e353de3f..0000000000 --- a/logs/2019-05-28-2.log.gz +++ /dev/null diff --git a/logs/2019-05-28-3.log.gz b/logs/2019-05-28-3.log.gz Binary files differdeleted file mode 100644 index edd9966d6c..0000000000 --- a/logs/2019-05-28-3.log.gz +++ /dev/null diff --git a/logs/2019-05-28-4.log.gz b/logs/2019-05-28-4.log.gz Binary files differdeleted file mode 100644 index aa32e1d848..0000000000 --- a/logs/2019-05-28-4.log.gz +++ /dev/null diff --git a/logs/2019-05-28-5.log.gz b/logs/2019-05-28-5.log.gz Binary files differdeleted file mode 100644 index dd57cdc3c5..0000000000 --- a/logs/2019-05-28-5.log.gz +++ /dev/null diff --git a/logs/2019-05-28-6.log.gz b/logs/2019-05-28-6.log.gz Binary files differdeleted file mode 100644 index 7b5a202eca..0000000000 --- a/logs/2019-05-28-6.log.gz +++ /dev/null diff --git a/logs/2019-05-28-7.log.gz b/logs/2019-05-28-7.log.gz Binary files differdeleted file mode 100644 index 1f7e0820c1..0000000000 --- a/logs/2019-05-28-7.log.gz +++ /dev/null diff --git a/logs/2019-05-29-1.log.gz b/logs/2019-05-29-1.log.gz Binary files differdeleted file mode 100644 index f6b9af60ca..0000000000 --- a/logs/2019-05-29-1.log.gz +++ /dev/null diff --git a/logs/2019-05-29-2.log.gz b/logs/2019-05-29-2.log.gz Binary files differdeleted file mode 100644 index da78de0cde..0000000000 --- a/logs/2019-05-29-2.log.gz +++ /dev/null diff --git a/logs/2019-05-29-3.log.gz b/logs/2019-05-29-3.log.gz Binary files differdeleted file mode 100644 index 115c78cbe1..0000000000 --- a/logs/2019-05-29-3.log.gz +++ /dev/null diff --git a/logs/2019-05-29-4.log.gz b/logs/2019-05-29-4.log.gz deleted file mode 100644 index 383e7442e6..0000000000 --- a/ |