Commit graph

815 commits

Author SHA1 Message Date
Blood-Asp
815f25d5d6 Merge pull request #898 from DEMOOH/unstable
New modes for Fluid Filter
2017-02-28 01:57:06 +01:00
Blood-Asp
9234358c45 Merge pull request #894 from Techlone/fix_both_bonuses_oilcracker
Fix a both bonuses in oilcracker
2017-02-28 01:56:49 +01:00
Blood-Asp
476146cd39 Merge pull request #890 from maixgame/unstable
Fix bug > Oil Teleportation to GC Planets #837
2017-02-28 01:55:31 +01:00
Maxime Legkiy
8e2280bc2c Fix name config category to UndergroundFluid
Fix comments configuration
Fix Start config - add nether and end to BlackList. Default spawn fluids on overworld and Moon.
Add Decrease Per Operation Amount (if 0 an endless source)
2017-02-17 01:55:54 +03:00
Maxime Legkiy
901a7d66c1 Add new flexible configuration undeground oil 2017-02-13 04:24:48 +03:00
DEMOOH
80fa2acfd1 Fix format 2017-02-12 12:28:18 +02:00
DEMOOH
244d54edfd New modes for Fluid Filter 2017-02-12 12:23:42 +02:00
Techlone
6aa902a946 Fix a possible situation when the oil cracking unit applies a both bonuses 2017-02-11 19:23:57 +05:00
Blood-Asp
64ddbfef6e Merge pull request #893 from Techlone/reactor_chambers_support
Reactor chambers support
2017-02-11 01:06:57 +01:00
Blood-Asp
b6674c9d96 Finish Cleanroom 2017-02-11 01:04:46 +01:00
Techlone
81abe867b0 Add support of reactor chambers in GT transformers 2017-02-11 03:41:36 +05:00
Maxime Legkiy
772ec04bf3 Add Underground Oil Generating settings in GregTech.cfg
Add supports White and Black List (DIM ID)
Add settings generating for standart Dimension and Galacticraft Dimension - Moon and Mars
Add settings for select type Underground Fluid - for Nether default Pahoehoe Lava, for Moon - Helium 3
Add settings max Amount Generating
For generating oil in other Dimension (Twilight Forest or Mystcraft) use settings - RealDimensionEnable
2017-02-09 05:38:20 +03:00
Maxime Legkiy
6567820a9b Fix generating Pollution in to other worlds 2017-02-07 13:34:31 +03:00
Maxime Legkiy
d3a72491b4 Add support Save/Load Dimensions Data 2017-02-07 04:47:52 +03:00
Maxime Legkiy
2d3310718a Add Dimension BlackList
Add Other Dimension Oil Generating
Save Amount for Other Dimension
2017-02-07 04:44:35 +03:00
Maxime Legkiy
00834b6c4b Add Underground Oil Spawn Dimensions
Fix bug reduction oil around coordinates 0 0
Add value MaxAmount in GregTech.cfg
2017-02-07 02:52:26 +03:00
Maxime Legkiy
d703850358 Add UndergroundOil Settings 2017-02-07 02:44:31 +03:00
Maxime Legkiy
379b6a8bd1 Fix generate oil around coordinates 0 0 2017-02-06 20:05:08 +03:00
Maxime Legkiy
811644f90a Fix bug > Oil Teleportation to GC Planets #837 2017-02-06 17:53:03 +03:00
Blood-Asp
5e19e7310f Merge pull request #889 from maixgame/unstable
Fix respawn oil amount if amount down to 0
2017-02-05 17:35:40 +01:00
Maxime Legkiy
2c82f057aa Fix respawn oil amount if amount down to 0 and reduction amount oil if use Seismic Prospector or more 2017-02-05 18:36:34 +03:00
Blood-Asp
f00ccaa279 fix turbine check in large turbines 2017-02-04 12:25:16 +01:00
Blood-Asp
9afffee2a6 Add checks to prevent crash on item inseration into generators 2017-02-03 22:46:39 +01:00
Blood-Asp
023609842c Fix charcoal pit accepting wood planks 2017-02-03 20:31:01 +01:00
Blood-Asp
b347471d03 Fix memory overflow with fluid stack on client side 2017-02-03 18:57:18 +01:00
Blood-Asp
d112ad06ae Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-02-03 18:37:29 +01:00
Blood-Asp
36bc0a6643 Fix osmiridium crafting recipe 2017-02-03 18:37:23 +01:00
Blood-Asp
632c918b8c Fix tungstencarbite recycling 2017-02-03 18:37:01 +01:00
Blood-Asp
42218dab90 Merge pull request #887 from DEMOOH/unstable
Steam extractor and compressor fix
2017-02-03 18:24:34 +01:00
DEMOOH
ba0a0ba4d4 Steam extractor and compressor fix 2017-02-02 14:02:51 +02:00
Muramasa-
37ca6746e3 Adjust process times/eut & steam machine NEI 2017-01-20 04:49:31 +00:00
John
cb4111d405 Merge pull request #5 from Blood-Asp/unstable
Update
2017-01-19 20:59:33 +05:00
Blood-Asp
65c5813ae3 Merge pull request #858 from Techlone/unstable
Disable miner when mining pipes is over
2017-01-19 12:38:50 +01:00
Blood-Asp
1cf283afa8 Merge pull request #857 from vlad20012/fix-816
Fix #816 obfuscated field name
2017-01-19 12:38:37 +01:00
Blood-Asp
e95e832aba Merge pull request #856 from vlad20012/fix-851
Fix #851
2017-01-19 12:38:04 +01:00
John
90442a8d91 check that miner can't move down 2017-01-14 04:11:13 +05:00
John
c39c6f8bea Merge pull request #4 from Blood-Asp/unstable
update
2017-01-14 04:05:25 +05:00
Muramasa-
5c5aad4522 Adds IC2 machine recipes to GT machines, needs testing 2017-01-13 21:35:18 +00:00
vlad20012
5af9a6718c Fix #816 obfuscated field name 2017-01-10 11:34:46 +03:00
vlad20012
095275bb36 Fix #851 2017-01-10 11:20:35 +03:00
Blood-Asp
8cb644066b Merge pull request #845 from KpoxaPy/issue-829
Fix #829 — Wrong output range in Tooltips
2017-01-06 16:16:01 +01:00
KpoxaPy
d64c5b2106 Update large turbines output tooltip Blood-Asp/GT5-Unofficial#829 issue 2017-01-05 15:04:15 +03:00
Blood-Asp
3b2e1a50aa Merge pull request #842 from KpoxaPy/feature-adv-prospector
Add advanced seismic prospector
2017-01-05 12:05:41 +01:00
KpoxaPy
4aa8fd45c4 Add advanced seismic prospector 2017-01-05 02:45:01 +03:00
Blood-Asp
b794aac1d0 Merge pull request #827 from KpoxaPy/unstable
Fix #825
2017-01-04 16:42:25 +01:00
Blood-Asp
868fe1f77d Merge pull request #833 from codewarrior0/patch-1
Fix #830 - Maint Cover does not emit if rotor needs maint
2017-01-04 16:36:04 +01:00
Blood-Asp
b7d187cc4e Merge pull request #836 from codewarrior0/issue-720-cme
Fix #720 - Concurrency error in GT_LanguageManager.addStringLocalization
2017-01-04 16:35:52 +01:00
Andrew Ozmitel
e7e48ff215 Merge remote-tracking branch 'upstream/unstable' into unstable 2017-01-04 15:16:31 +03:00
David Vierra
50b9fc9238 Fix #720 - Concurrency error in GT_LanguageManager.addStringLocalization 2017-01-01 21:57:31 -10:00
Muramasa-
7a8067868d Add missing NEI GUIs & IC2 machine recipe config 2016-12-31 10:17:55 +00:00