Commit graph

500 commits

Author SHA1 Message Date
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
Andrew Ozmitel
674a2aec83 Fix Blood-Asp/GT5-Unofficial#825 2016-12-28 20:03:05 +03:00
Blood-Asp
94cdcfe33c Fix fluid naquadah generator not consuming fuel 2016-12-27 12:14:40 +01:00
Blood-Asp
2d35f8c0bc Adding missing GT++ metaitems 2016-12-24 00:44:13 +01:00
Blood-Asp
4e1c4b241d Fix broken Hydric Sulfide recipe 2016-12-24 00:41:24 +01:00
Blood-Asp
60328e2adf Fix oil only be found on second scan 2016-12-23 18:01:36 +01:00
Blood-Asp
77b25d8c82 Add new usages for Graphite 2016-12-23 17:57:58 +01:00
Blood-Asp
82b97af85e Naquadah gen mk3 now uses cells with molten naquadah instead of dust 2016-12-23 14:27:42 +01:00
Blood-Asp
1efd486dbb Disable markDirty function of TileEntitys
http://forum.industrial-craft.net/index.php?page=Thread&postID=205162#post205162
2016-12-13 20:10:30 +01:00
David Vierra
3b5dfb6f7b Fix #785 - Unlimited EU in Dynamo Hatch
I went with @Techlone's simple solution after all.

Counting out the individual EU might make more sense if any of the multiblocks could have more than one dynamo hatch, but they don't, so this is just fine.
2016-12-13 19:24:31 +01:00
Blood-Asp
8e31958980 Merge pull request #777 from Dimach/unstable
Fixed #767
2016-12-13 19:17:47 +01:00
Blood-Asp
423b3ad8ef Merge pull request #798 from Techlone/unstable
Fix optimal plasma flow tooltip
2016-12-13 19:16:21 +01:00
David Vierra
d519d7f00b Replace all literal numbers referring to tool types with named constants 2016-12-13 19:15:07 +01:00
Techlone
75fc96694a fix optimal plasma flow tooltip 2016-12-12 22:59:04 +05:00
Dimach
b1c2cbe935 Fixed #767. 2016-11-28 22:05:42 +02:00
Timeslice42
7df5add5a9 Re-add single-use batteries
How did this get removed? ><
2016-11-05 22:11:36 +01:00
Blood-Asp
395888a884 Modular Armor configs 2016-11-02 22:14:18 +01:00
Danila Bolshakov
7c1d44d835 Maintenance does not change the machine color 2016-11-01 02:10:56 +03:00
Blood-Asp
cef2d02416 Merge pull request #713 from Technus/patch-1
Fix for Scanner
2016-10-30 22:41:17 +01:00
Blood-Asp
814dc25690 Modular Armor changes 1 2016-10-30 22:39:40 +01:00
Daniel
b3ed735ef2 Fix for Scanner
being derp when looking @ pollution
2016-10-30 11:09:24 +01:00
Blood-Asp
ed724da44d Auto Maintainance fix 2016-10-27 22:24:41 +02:00
Blood-Asp
1f64005592 Auto Maintainance fix (maybe) 2016-10-27 00:30:26 +02:00
Blood-Asp
11130dd435 More Translation stuff. Hope it does not lag. 2016-10-26 21:57:20 +02:00
Blood-Asp
16f03e76e8 Allow max 1 crafting sound every 10 ticks to prevent rare crashes. 2016-10-26 20:34:04 +02:00
Blood-Asp
03f6c9e2f9 Replace not working localization function with own map. 2016-10-26 18:44:14 +02:00
Blood-Asp
4a8a0ab576 Fluid Regulator code optimization 2016-10-26 17:08:28 +02:00
Blood-Asp
2d5c40ef8f some bugfixes 2016-10-26 00:57:33 +02:00
Blood-Asp
7926877ed1 Pollution Update/Rebalance 2016-10-25 20:22:56 +02:00
Blood-Asp
3c3231c4f8 Add EnderIO Alloy recipes 2016-10-25 00:14:30 +02:00
Blood-Asp
d930dc385b Fix maceration byproducts 2016-10-24 23:28:04 +02:00
Blood-Asp
466a6483dc New Recipes for Lapotron Crystals, Mining Pipe, Mining Laser and Quantum Armor. 2016-10-23 23:11:32 +02:00
Blood-Asp
13c8f127cd Add Automatic Maintainance Hatch 2016-10-23 12:15:42 +02:00
Blood-Asp
4b29e30e75 Fix droping of items when pulling from doublechests 2016-10-23 00:30:24 +02:00
Blood-Asp
f8408d6a9b quick fixes 2016-10-22 23:51:28 +02:00
Blood-Asp
6c4f17d52e Try to move full stack into targed inventory, not single operation. 2016-10-22 23:19:32 +02:00
Blood-Asp
13180eb4a4 Detect GT++ and enable materials for it. 2016-10-22 18:15:39 +02:00
Blood-Asp
a82469b481 Missed one file 2016-10-22 16:38:30 +02:00
Blood-Asp
f12ae9a63f Add Naquadah fuel rods and fix some Assemblyline recipes
Naquadah fuel = Mox with 10x runtime.
2016-10-22 16:38:18 +02:00
Blood-Asp
dc56e5ef44 Immersive Engineering compatibility and more fuels in generators 2016-10-22 13:04:50 +02:00
Blood-Asp
05bd0a7435 Improve Magneticraft compatibility 2016-10-22 01:23:24 +02:00
Blood-Asp
49ff6ffa31 Wrench shift click can move machine front direction 2016-10-21 20:12:23 +02:00
Blood-Asp
00d19d70be Turbines and Oil Drilling rig now show missing items in GUI 2016-10-19 21:57:53 +02:00
Blood-Asp
b48613dc7d Add EnderIO Rocket Fuel compat 2016-10-19 00:37:48 +02:00
Blood-Asp
76bb14a2ee Improve readability of materials 2016-10-18 22:01:30 +02:00
Blood-Asp
9f9c0e0d69 Adding Duranium and Tritanium as Tier 5/6 Tool materials superior to HSS and below neutronium 2016-10-18 18:51:25 +02:00
Blood-Asp
a6301759b1 Exploding GT machines now drop randomly some of their crafting components. 2016-10-17 12:37:13 +02:00
Blood-Asp
fa79dcd263 Base IC2 Classic compat. Reactor components disabled, some recipes likely missing/broken 2016-10-16 18:08:26 +02:00