Commit graph

255 commits

Author SHA1 Message Date
Blood-Asp
4d9fd9fb86 update gitignore 2015-09-05 23:29:34 +02:00
Blood-Asp
1f3bb4317f GT5.08.29 2015-09-05 23:18:46 +02:00
Blood-Asp
fbf9df8b2e error revert 2015-09-05 00:48:39 +02:00
Blood-Asp
31c80e0078 Merge remote-tracking branch 'origin/master' 2015-09-05 00:46:03 +02:00
Blood-Asp
0cb1cbd6bc Version 5.08.28 2015-09-05 00:43:17 +02:00
Blood-Asp
683d46f4c8 Merge pull request #156 from InfinityStudio/master
Fixed large steam turbine do not consume steam.
2015-08-30 17:26:36 +02:00
DerekCHAN
08b28cbb65 Fixed large steam turbine do not consume steam.
Large steam turbine do not consume steam as MFR installed. Simply caused by MFR changed regular steam "fluid.steam" to "fluid.mfr.steam.still.name".
2015-08-22 23:37:57 +08:00
Blood-Asp
4263f3b43f push buildscript 2015-08-21 21:45:39 +02:00
Blood-Asp
a7f60e0752 GT5.08.27 2015-08-16 01:10:06 +02:00
Blood-Asp
87a74a3344 Merge pull request #143 from pyure/patch-2
Turbines don't shut down automatically
2015-08-15 21:51:02 +02:00
Blood-Asp
2892a32022 Merge pull request #142 from pyure/patch-1
Heat Exchanger updates
2015-08-15 21:50:37 +02:00
pyure
f0090eef75 Turbines don't shut down automatically
Turbines no longer shut down automatically when they lose steam.  Instead, efficiency drops 10% per cycle when inactive.
2015-08-15 00:03:33 -04:00
pyure
2f340097b9 Heat Exchanger updates
* Can now adjust the minimum threshold for Superheated steam via Integrated Circuits inside the LHE

* Restored full useWater reliance
* HotCoolant now increases efficiency at same rate as lava (80 instead of 20, feel free to revert)
* Please double-check math on Lava output.
2015-08-14 23:56:36 -04:00
Blood-Asp
0341ae67ef Merge pull request #136 from pyure/master
Turbine fixes
2015-08-13 21:38:53 +02:00
pyure
b0e064bf28 Steam Turbine fixes
Removed requirement for getAverage()
2015-08-12 15:39:42 -04:00
pyure
e41504b920 Steam turbine getAverage() disabled
Removed requirement of getAverage()
2015-08-12 15:17:31 -04:00
pyure
0c7b825e7e Plasma turbine fixes
* Math fixes (no more crazy output numbers)
* getAverage() references removed 
* multiple input hatch support (first fluid-type handled only in case user tries to fuel with different-valued plasma types simultaneously)
* 125% maximum overflow inefficiency
2015-08-12 15:15:45 -04:00
pyure
27da7acbb3 HP Steam turbine fixes
* Math fixes (no more crazy output numbers)
* getAverage() references removed 
* multiple input hatch support (no more exploits by feeding HP Steam to multiple hatches)
* 125% maximum overflow inefficiency
* Output ties directly to actual HP Steam consumed
2015-08-12 15:14:06 -04:00
pyure
6d61dead98 Gas turbine fixes
* Math fixes (no more crazy output numbers)
* getAverage() references removed 
* multiple input hatch support (first fluid-type handled only in case user tries to fuel with methane + hydrogen simultaneously)
* 125% maximum overflow inefficiency
2015-08-12 15:11:57 -04:00
pyure
a3a6c55275 remove getAverage()
We now do gradual output changes depending on the difference in current and target output level
2015-08-12 14:47:33 -04:00
pyure
1b3e6ef291 Merge pull request #1 from Blood-Asp/master
Merging or totally fucking up, one or the other.
2015-08-12 14:28:52 -04:00
Blood-Asp
b0a60598aa Merge pull request #134 from pyure/patch-4
Large Heat Exchanger water/steam ratio
2015-08-12 15:52:21 +02:00
pyure
8e15794c0a Large Heat Exchanger water/steam ratio
* Ratio now 1:160 (perfect)
* Now use useWater properly as intended 
* NOT using math.Round() or math.Floor()
2015-08-11 18:49:51 -04:00
Blood-Asp
95607cae55 Merge pull request #127 from pyure/patch-2
Update Large Steam Turbine
2015-08-09 23:19:52 +02:00
pyure
a170c6529a Update Large Steam Turbine
* Multiple input hatches now handled properly.
* Now use 125% maximum input consumption and penalty
* We now track averageFlow and totalFlow separately: we don't want turbine byproducts generated from the average, but the actual consumption.


Notes from last pull:
* We track 125% allowance via remainingFlow.  We do still attempt to pull 125% from each hatch, but only up to our 125% overall allowance. (So even with two hatches, we can still only pull 500 steam total from a 400 steam rotor)
* With remainingFlow, we gain optimization: we don't even check unnecessary hatches if the first one provided enough steam.
* Reinstated averageFlow.
* added a ton of comments for your convenience.
2015-08-08 20:14:06 -04:00
Blood-Asp
c71e7473d6 Update 5.08.26 2015-08-02 13:00:23 +02:00
Blood-Asp
080a4c2117 V5.08.25 2015-07-25 18:34:52 +02:00
Blood-Asp
eac14b4b28 GT 5.08.24 2015-07-12 12:45:19 +02:00
Blood-Asp
070f7c32ca Merge pull request #83 from Kodos-Atoz/patch-2
Update en_US.lang
2015-07-09 08:15:58 +02:00
Kodos Atoz
9c3847a10b Update en_US.lang
I can has grammar?
2015-07-06 11:02:45 -05:00
Blood-Asp
d57a537a73 Merge pull request #77 from Kodos-Atoz/patch-1
Update en_US.lang
2015-07-06 16:50:37 +02:00
Kodos Atoz
16c21e8be6 Update en_US.lang
Correct some misspellings and spacings.

Probably incomplete, but I'm tired and cba to go over every word.
2015-07-02 18:27:09 -05:00
Blood-Asp
002e757d65 Version 5.08.22-23 2015-06-29 23:03:55 +02:00
Blood-Asp
8198a51aee Version 5.08.21 2015-06-27 03:26:08 +02:00
Blood-Asp
6591e802e9 Merge pull request #71 from aerospark/devel
Linenumber strip
Well, let's try this, but i'm not going trough all classes to make sure there is nothing broken.
2015-06-24 19:34:37 +02:00
aerospark
a1504799f4 strip linenumbers 2015-06-23 15:29:05 -07:00
aerospark
b803f59de5 Merge pull request #1 from Blood-Asp/master
version 5.08.20
2015-06-22 19:06:38 -04:00
Blood-Asp
55c596b008 version 5.08.20
moar bugfixes
2015-06-22 22:59:03 +02:00
aerospark
ff871d6b8a Update GT_TileEntity_Ores.java
Fix iron worldgen exploit
2015-06-21 19:50:24 -04:00
Blood-Asp
f6fc2a6df6 Update 5.08.19 2015-06-07 21:25:40 +02:00
Blood-Asp
7e0b4194ac Update 5.08.18
RF Support and finished Processing array
2015-05-28 00:29:03 +02:00
Blood-Asp
adb4a5eef6 Update 5.08.17
Large Turbines, Heat exchanger, player detector
2015-05-25 23:04:14 +02:00
Blood-Asp
a102e63891 Update 5.08.16
Monster repellator + large turbine
2015-05-19 23:12:36 +02:00
Blood-Asp
20313127ce Merge pull request #23 from doushio9967/fix-registerore
Fix JD's broken code
2015-05-19 18:22:18 +02:00
(;´・ω・)
b3b1c10bfc Fix JD's broken code
Otherwise most materials will simply not get registered.
2015-05-19 17:19:33 +02:00
Blood-Asp
83f8f232e7 update 5.08.14 2015-05-18 23:56:48 +02:00
Blood-Asp
1209f95bc2 update 5.08.13
Turbine items and achievements
2015-05-16 02:51:56 +02:00
Blood-Asp
277e3ddfd2 update 5.08.12
- Added config to enable TCon in unification.
- Added Teleporter.
- Added Needs Maintainance Cover.
- Changed Ultimate Battery Textures.
- Changed Pump area (8(2^tier) -> 10(1.6^tier).
2015-05-11 16:09:03 +02:00
Blood-Asp
1d802999d8 More updates.
Many bugfixes + 5 Tier Pump + API.jar
2015-05-10 11:23:53 +02:00
Blood-Asp
eba3a051ca QChest + Wireless RS 2015-04-30 19:34:16 +02:00