Commit graph

727 commits

Author SHA1 Message Date
Blood-Asp
6e3e6494a1 Merge pull request #803 from dgabehar/unstable
Crash with Modular Exoskeleton #769
2016-12-17 18:21:51 +01:00
Blood-Asp
c9eb3dc3b4 Rise Hot coolant -> heat conversion ration in IC2 heat exchanger by 20% to avoid rounding bug 2016-12-17 18:20:59 +01:00
Blood-Asp
f3f90f699b Fix Food Can recipes 2016-12-17 18:16:37 +01:00
Blood-Asp
1aa9ce6501 Fix LuV+ disassemblers 2016-12-17 18:10:38 +01:00
Dragon2488
2dc3925c62 Bugfixes 2016-12-17 23:56:09 +07:00
Dragon2488
a6416b6d88 Fuck. DrawBlockHighlightEvent is called for entities too. 2016-12-17 20:28:42 +07:00
Dragon2488
97f7f34dae Bugfixes 2016-12-17 16:12:14 +07:00
Blood-Asp
f0ff2a6cfc Void wrong type of steam inserted into steam turbines.
Prevents getting stuck on superheated/normal steam change.
2016-12-16 18:34:26 +01:00
Dragon2488
24f436b066 Crash with latest IC2 fix. (again?) 2016-12-17 00:28:09 +07:00
Blood-Asp
cca28f29fa Add mable and basalt ores to ore typefilter 2016-12-16 17:54:43 +01:00
Dragon2488
30318c25fa Crash with latest IC2 fix. 2016-12-16 23:39:12 +07:00
Blood-Asp
650ec1a800 Fix ULV and LV wire/cable recipes 2016-12-16 17:23:39 +01:00
Doug Gabehart
3d2dd065fa Added check to ensure that fluid is set trying to provide air to player during onArmorTick
Looking at how to fill helmet tank from air cell
2016-12-15 17:11:13 -06:00
Dragon2488
1183d4765d Fixes. 2016-12-16 00:12:47 +07:00
Doug Gabehart
b41c3370cc Fixed processing power issue where values continually increased up to infinity 2016-12-15 09:10:45 -06:00
Dragon2488
08a257ebd1 Added latest builds 2016-12-15 22:06:12 +07:00
Dragon2488
a9efed5fdc CCL dependency. 2016-12-15 21:59:35 +07:00
Dragon2488
202c22f5ae Major rewrite (second, third?), beta release. 2016-12-15 21:58:15 +07:00
Doug Gabehart
6364378437 More stability improvements. (Null value and checks to ensure keys exist) 2016-12-14 20:35:43 -06:00
Doug Gabehart
6ceff6d783 Fixed issue with Modular Armor inventory not saving properly after removing the call to closeScreen
Added null and key checks when determining if a full radiation or electrical armor set is configured
2016-12-14 16:04:20 -06:00
David Vierra
7d1e42f75c Don't allow Large Turbine to start up without Dynamo Hatch
Large Turbine was incomplete if the Dynamo Hatch spot was taken up by a different GTTE, but not if that spot was just Air or some other block.
2016-12-14 20:06:31 +01:00
Doug Gabehart
b9ebe16655 Removed player.closeScreen call to fix graphics glitch when switching armor tabs 2016-12-14 11:34:00 -06:00
Doug Gabehart
df00993c0d Added updateArmorStats method which includes additional checks to ensure that values are not null and the key in question exists in mStats
Removed player.closeScreen call in mouseClicked to prevent display glitch when switching armor gui tabs; (mouse focus from returning to 2x2 crafting grid)
2016-12-14 11:12:07 -06:00
Dimach
d51f43f97b Ore harvest level rework. Fixed #730. 2016-12-13 20:20:36 +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
Blood-Asp
f86fce4cf3 Fix mining laser recipe 2016-12-13 20:08:23 +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
0cd2371e3b Change Oil Cracker tooltip to match reality (and vice versa)
Oil Cracker only allows Maint/Energy hatches in the middle ring. Input and output hatches can be anywhere on the sides.

Minimum casing count is changed to 18 to match the tooltip, rather than increase the tooltip to 19. This allows two input and output hatches on either side, for when you want to run two cracking recipes with the same cracker.

(It turns out the cracker doesn't care which hatch the inputs and hydro/steam are put into. I don't really care either!)
2016-12-13 19:15:08 +01:00
David Vierra
dcf348a7e1 Fix efficiency penalty incorrectly applied to large gas+plasma turbines
This is a copy-paste error from the original code in the large steam
turbine. `aOptFlow` is the optimal flow rate expressed in EU/t, while
`totalFlow` is expressed in fuel L/t
2016-12-13 19:15:08 +01:00
David Vierra
f98ce7ef08 Fix #771 - 9x output on boosted Diesel
Remove an extra efficiency multiplier. `mEfficiency * mEUt` is already done in `GT_MetaTileEntity_MultiBlockBase.onRunningTick`
2016-12-13 19:15:07 +01:00
David Vierra
d699de59ba Adjust Diesel Engine tooltip to match requirements
16 Casings are required along the corners and edges. The Hatches may not be along a corner or edge, but may only be placed on the sides, next to a Gear Box.

Also note Diesel, Lube, and Oxygen use.
2016-12-13 19:15:07 +01:00
David Vierra
d519d7f00b Replace all literal numbers referring to tool types with named constants 2016-12-13 19:15:07 +01:00
Данила Большаков
8ea9df2e7b Hide bar 2016-12-13 13:53:37 +03:00
Danila Bolshakov
60704cca7f forgot check null 2016-12-13 11:50:01 +03:00
Danila Bolshakov
920ba2f0c3 Add progress bar 2016-12-13 11:41:38 +03:00
Techlone
75fc96694a fix optimal plasma flow tooltip 2016-12-12 22:59:04 +05:00
Archengius
248b88e8bc Merge pull request #797 from Dimach/fluidregulator-fix
Fixed #796.
2016-12-12 01:22:59 +07:00
Dimach
be37504009 Fixed #796. 2016-12-11 19:56:06 +02:00
Blood-Asp
34481d0c85 Merge pull request #788 from Dimach/unstable-upstream
Fixed #786.
2016-12-07 22:07:49 +01:00
Dimach
151fc26133 Fixed #786. 2016-12-07 11:48:33 +02:00
David Vierra
4176f2c525 Fix Advanced Miner II occasionally outputting the wrong blocks
AdvMinerII would occasionally output the drops from a block recently
broken by the player. This happens when the wrong coordinates are
passed to GT_Block_Ores_Abstract.getDrops(), which causes it to fail to
find the TileEntity and then fall back to whatever the most recently
broken block was.

Fixes #751 (probably), #674, #508
2016-12-04 15:22:03 -10: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
58206f909e Merge pull request #727 from Dimach/unstable
Fixed oil rig
2016-11-04 22:13:45 +01:00
Dimach
bc619efb8a Fixed oil rig. 2016-11-04 21:30:57 +02:00
Blood-Asp
2108b9cdc8 Assemblyline recipe scan fix and TC quicksilver/mercury recipes 2016-11-04 00:05:15 +01:00
Blood-Asp
c552f67120 Fix Large turbine tooltips 2016-11-02 23:16:23 +01:00
Blood-Asp
8a17c67442 Turn off AdvMinerII and OilDrill once work is done. 2016-11-02 23:14:40 +01:00
Blood-Asp
481580b723 Fix broken crop oreprocessing 2016-11-02 22:55:13 +01:00
Blood-Asp
395888a884 Modular Armor configs 2016-11-02 22:14:18 +01:00
Blood-Asp
bacc30c248 Merge pull request #716 from danbka33/patch-1
Fix maintenance does not change the machine color
2016-11-02 18:24:36 +01:00
Blood-Asp
a60428ab53 Fix ignored oredict names list not working 2016-11-01 13:18:44 +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
3d88803b11 Add GT recipes for GraviSuite 2016-10-27 00:24:56 +02:00
Blood-Asp
11130dd435 More Translation stuff. Hope it does not lag. 2016-10-26 21:57:20 +02:00
Blood-Asp
f806a7b76d Fix super fuel not increasing efficiency 2016-10-26 21:02:15 +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
8c1550e5c2 Improve harvest range of sense to 5x5x5(now working) 2016-10-26 18:59:10 +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
Dragon2488
ebad9b80dd Harvest Level fix 2016-10-25 13:13:00 +07: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
Dragon2488
87b033b319 Server side crash fix. 2016-10-24 00:31:45 +07:00
Blood-Asp
13c8f127cd Add Automatic Maintainance Hatch 2016-10-23 12:15:42 +02:00
Dragon2488
484a9e7640 Rendering overhaul & ores overhaul 2016-10-23 16:59:59 +07: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
8ef12119e0 Added new mode to only check large turbine rotors with need maintainance cover 2016-10-22 17:28:03 +02:00
Blood-Asp
15eb43998a Remove debug code 2016-10-22 16:42:30 +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
e2ee26e55e Fix some recipes not working in processing array 2016-10-22 14:01:59 +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
d6246051b1 Fix more nugget exploits 2016-10-22 00:34:56 +02:00
Blood-Asp
6dd3ab8cce Fix mercury crafting exploit 2016-10-21 23:51:48 +02:00
Blood-Asp
49ff6ffa31 Wrench shift click can move machine front direction 2016-10-21 20:12:23 +02:00
Blood-Asp
187a49f43c Some Block fixes 2016-10-19 22:27:27 +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
6d338c1d1d Hide remaining disabled crates 2016-10-19 20:38:36 +02:00
Blood-Asp
1222044422 Hide Covers for Forestry woods if forestry is disabled 2016-10-19 19:23:05 +02:00
Blood-Asp
f580712f18 Allow Oil Drills to pump oil in void worlds without bedrock 2016-10-19 18:41:29 +02:00
Blood-Asp
fdafabf291 Make Dough by throwing flour into filled cauldron 2016-10-19 18:31:17 +02:00
Blood-Asp
37f3215d99 Add all missing potion brewing recipes 2016-10-19 14:43:26 +02:00
Blood-Asp
a70ce1a67b Cleanup recipe classes 2016-10-19 13:37:36 +02:00
Blood-Asp
b48613dc7d Add EnderIO Rocket Fuel compat 2016-10-19 00:37:48 +02:00
Blood-Asp
c76accfa6d Remove ImmEng recipes for easy crafting of Steel/Iron/Aluminium Rods 2016-10-18 22:24:00 +02:00
Blood-Asp
3e8cee3d72 Radon and Naquadria fusion recipes 2016-10-18 22:16:23 +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
4384688c07 Fix Compressed Aluminium issues. Making of Compressed plates and use in heavy duty alloy ingots. 2016-10-18 18:49:48 +02:00
Blood-Asp
7cec5fae5f Add the missing food crops 2016-10-17 17:13:41 +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
637f704235 Make Disassemblers >Insane Voltage disassemble faster without efficency loss. 2016-10-17 00:09:07 +02:00
Blood-Asp
5a52b80ee7 Give ore Achievements from all ore stone types 2016-10-17 00:03:05 +02:00
Blood-Asp
a50a5a1527 Fix paperboard recipes 2016-10-16 23:55:54 +02:00
Blood-Asp
52d40e14bc Fix recipes for forestry wood covers. 2016-10-16 20:41:49 +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
Blood-Asp
f97698b054 Catch crash with Fossils Archeology Revival #642 2016-10-15 15:42:45 +02:00
Dimach
f037d652a7 Added forming press support for processing arrays. 2016-10-13 23:26:03 +02:00
Blood-Asp
c240b431f8 Fixed charcoal pile igniter bug 2016-10-13 22:48:08 +02:00
Blood-Asp
a006b76304 Drop Items from Exploding GT Machines + Config 2016-10-13 22:26:14 +02:00
Muramasa
ce632479bc Hide some unused blocks in NEI 2016-10-13 18:52:21 +01:00
Muramasa
e16b037cb7 Add config to enable all disabled mats & components. 2016-10-13 18:51:14 +01:00
Blood-Asp
021ed41721 Update Multiblock Tooltips 2016-10-13 17:46:05 +02:00
Muramasa
66ab344159 Fix VALUES & Replicator recipes 2016-10-13 16:43:06 +01:00
Blood-Asp
d4c23ed7a7 Show nuggets by default in NEI 2016-10-13 13:49:52 +02:00
Muramasa
796b822ab6 Add HasParentMod to config & Generate fluids for all Materials 2016-10-11 22:51:52 +01:00
Blood-Asp
1c8fcb89ec Fixing Heavy Duty Alloy Ingot recipes 2016-10-10 18:42:37 +02:00
Blood-Asp
bd3f76d12f Optimize hiding of fluid extraction recipes. 2016-10-10 18:10:32 +02:00
Muramasa
de9ade9d77 Fix TGreg & Remove unneeded config entries 2016-10-09 22:00:40 +01:00
Muramasa
88b78479c6 Fix Material.toString 2016-10-09 15:38:35 +01:00
Blood-Asp
3f92caf931 Fix Stone/Wood gear recipes 2016-10-09 16:34:41 +02:00
Blood-Asp
1b78b56388 Alloy energy hatch in every slice of the assembly line 2016-10-09 00:13:49 +02:00
Blood-Asp
64e495e32c Auto enable subitems when parser enables items. 2016-10-08 20:35:41 +02:00
Dimach
104bcf62d8 Fixed fluid regulator. 2016-10-08 20:17:03 +02:00
Blood-Asp
1a78a8dd51 ReaddAnnealed/Wrought config 2016-10-08 20:08:54 +02:00
Muramasa
79f0947172 Pull exp changes 2016-10-07 16:50:34 +01:00
Muramasa
b88e197530 Fix GT Crop extraction recipes & Seperate Comb&Crop nerf config option 2016-10-07 16:44:21 +01:00
Blood-Asp
c27399b512 Move load order for doors to fix malisis doors conflict. 2016-10-07 17:36:21 +02:00
Muramasa
2fb0ba6770 Fix nugget recipes 2016-10-07 13:50:38 +01:00
Blood-Asp
db7db8e4a0 Revert unwanted Heating Capacity behavior change. 2016-10-07 12:04:58 +02:00
Blood-Asp
6bcb607808 Sift only crushed ores that are gems 2016-10-07 01:13:26 +02:00
Blood-Asp
06c156a0c2 Return slabs on paper craft(this time without bug) 2016-10-07 01:12:46 +02:00
Blood-Asp
bdee358c0c Move ingot processing code to the right class. 2016-10-06 22:32:36 +02:00
Muramasa
d2efd7ae54 Small fixes 2016-10-04 04:32:51 +01:00
Muramasa
b457c53915 Update 2016-10-04 04:15:54 +01:00
Muramasa
173700a611 Computronics support & Improved mod dependant Materials 2016-10-04 04:12:40 +01:00
Blood-Asp
d8dfffc01f Fix wires from ingots (again) 2016-10-04 00:25:55 +02:00
Muramasa
73f75357bc Add fluids without enabling the material 2016-10-03 10:40:36 +01:00
Blood-Asp
92294c1f88 MT script parser + metaitem reenabler do now work 2016-10-02 21:39:42 +02:00
Blood-Asp
811f2e971b quickfix reenabler 2016-10-02 19:16:20 +02:00
Blood-Asp
d3fc27c4dc Auto enable items found by MT script parser. Needs testing. 2016-10-02 19:12:55 +02:00
Blood-Asp
49843d2779 MT script parser 2016-10-02 17:58:28 +02:00
Dragon2488
13155cb4da 123 2016-10-02 11:15:33 +07:00
Dragon2488
d88748aa93 Legacy & New JEI capability 2016-10-01 11:20:56 +07:00
Muramasa
6564df167d Fix another dumb mistake 2016-10-01 03:53:10 +01:00