Commit graph

2986 commits

Author SHA1 Message Date
Modmuss50
7a55995546 Merge pull request #1265 from alexpic57/1.12
fix background not showing on somes machines
2017-09-06 13:48:39 +01:00
modmuss50
094b67e050 Slight rework of the gui system, should fix some issues with wrenching. Should fix #1264 fixes #988 + a handful of weird gui de-syncs 2017-09-06 13:46:12 +01:00
alexpic57
93b869a446 fix background not showing on somes machines 2017-09-06 14:42:54 +02:00
drcrazy
8588a40474 Added plateIridiumAlloy. Closes #1262. Closes #1073 2017-09-06 02:38:07 +03:00
drcrazy
71a0ac3e66 Updated recipe to use or not use oreDict names. Closes #1210 2017-09-05 23:40:40 +03:00
drcrazy
849f9fc07b Fix null IItemstack being converted to air. I hope. Closes #1222 2017-09-05 18:02:42 +03:00
drcrazy
48c9371d77 Added missing cell recipes. Closes #867 2017-09-05 15:32:43 +03:00
drcrazy
a1c77aa47c Merged inventory keys in blockstate jsons 2017-09-05 00:15:02 +03:00
drcrazy
c11b79828c #releaseBuild 2017-09-04 00:57:25 +03:00
drcrazy
dfaef8a6c2 Updated fluid generators GUI. Closes #1097 2017-09-04 00:12:58 +03:00
drcrazy
37d8b8641f GUI rework for Diesel generator 2017-09-03 03:41:50 +03:00
drcrazy
d5a3118801 Made iridium reinforced blocks more blast resistant. Closes #1259 2017-09-02 01:30:36 +03:00
drcrazy
021a6b0077 Fix for name format. Closes #1258 2017-09-01 18:40:33 +03:00
drcrazy
207ac79b77 Change sulfur output from dust to cell. Closes #1105 2017-09-01 17:35:38 +03:00
drcrazy
07b1724e24 Updated max energy storage for several tools. Closes #1219 2017-09-01 16:19:59 +03:00
drcrazy
ace5813745 Update onBlockActivated to use newer method 2017-09-01 13:42:39 +03:00
drcrazy
ceac5fc282 Update for deprecated method 2017-09-01 02:32:05 +03:00
drcrazy
6a36f79e03 Removed duplicate coal dust grinding recipe. Closes #1256 2017-08-31 13:06:41 +03:00
drcrazy
46f9266197 Magnalium plate is back. Closes #1109 2017-08-31 03:02:00 +03:00
modmuss50
3011546462
Block energy storage now uses the new wrench api 2017-08-30 21:59:21 +01:00
modmuss50
6f6800e75a
Rewrite wrench to use new API 2017-08-30 21:57:14 +01:00
modmuss50
20e9276bd9
Fixes #1043 2017-08-30 21:25:13 +01:00
drcrazy
efbd5542b4 Code unification 2017-08-30 10:19:54 +03:00
drcrazy
4ef1c74b1f #releaseBuild 2017-08-29 20:01:15 +03:00
drcrazy
ab1428eb12 Fix for machine tank drain. More luv to industrial grinder. (#1254)
* Fix for machine tank drain. More luv to grinder

Fix for empty cell drained from tank.
JEI should honor power units (FE\EU) used.
Fill\drain tank only two times per second in order to avoid game crash
due to ticking entity.
2017-08-29 19:57:21 +03:00
drcrazy
63be913878 Fix for Industrial Grinder. Closes #1155 (#1253)
Fix for tank issue, recipe energy consumption made equal to I\O rate, a
little bit of cleanup
2017-08-28 00:38:10 +03:00
drcrazy
44524a680b Fix alloy plate name, MFU and MFSU I\O rates (#1249)
* Fixed name for advanced alloy plate

* Fix rates and storage amount for MFE and MFSU. Closes #1205
2017-08-26 01:58:35 +03:00
drcrazy
e19e483d2f No more excessive NBT tags for drained cells. Closes #1244, #1216 (#1248) 2017-08-25 20:57:47 +01:00
David Vierra
a016a6dd49 Replace all emptiness checks == ItemStack.Empty with .isEmpty() (#1247)
Fixes #1157 and probably a few other things.
2017-08-25 11:08:15 -07:00
drcrazy
df808760ad Make cells drainable again (#1246)
* FIx unused import

* Make cells drainable again

* Fix deprecated warning
2017-08-25 00:39:44 -07:00
Modmuss50
c401f116aa #releaseBuild include a load of fixes from drcrazy 2017-08-24 17:41:23 +01:00
drcrazy
e814a1bf3b More refactoring for recipes. Also closes #1225 and #1223 and #1190 (#1245) 2017-08-23 17:10:06 -07:00
drcrazy
51ee1b66ff Update for tier0 textures. Fix for #1170 (#1242) 2017-08-22 04:04:47 -07:00
drcrazy
f465c6cf47 Refactored Crafting Table recipies; Fixed IDE warnings for unused (#1241)
imports; Update CoFH deps to fix build
2017-08-21 14:25:13 -07:00
modmuss50
64a261d254
#releaseBuild 2017-08-16 11:46:57 +01:00
modmuss50
b0cf304dfa
#releaseBuild 2017-08-16 11:45:00 +01:00
modmuss50
0fbc9fe04b
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-08-15 19:01:41 +01:00
modmuss50
11990301d3
1.12.1 2017-08-15 19:00:37 +01:00
drcrazy
94795b7d42 Fix Vacuum Freezer wrench drop. Closes #1196 (#1235) 2017-08-14 12:46:38 +01:00
Modmuss50
ad3d13d134 Remove debug code 2017-08-14 11:56:24 +01:00
Paul
9c07d6fa1c Fix matter fabricator energy use, adds EU-per-amp config value (#1231)
* Fix matter fabricator energy use, adds EU-per-amp config value

should compile, probably...

* Also fix the output inventory access

was limited to the first slot, now it isn't

* oops, to much EU...

that's one less 6, sorry...
2017-08-09 10:53:19 +03:00
drcrazy
aa2d15c109 Fix for issue #1218 - Can't Macerate Basalt or Marble (#1224) 2017-08-02 00:29:12 +01:00
modmuss50
3ea0d2541a
#releaseBuild 2017-07-28 21:10:19 +01:00
modmuss50
77e833f9d4
Fixes #1197 2017-07-28 21:08:11 +01:00
modmuss50
0906f1fdc1
Fixes #1201 2017-07-28 21:03:12 +01:00
modmuss50
dc966c0d83
Fixes broken recipes, closes #1208 2017-07-28 21:01:08 +01:00
modmuss50
ea7baf437b
Fix small exploit with TE integration. 2017-07-28 20:28:23 +01:00
modmuss50
f4a641f3cb
Fix crash with malisis mods, #releaseBuild Fixes #1199 2017-07-19 18:23:45 +01:00
modmuss50
2f221ed8c8
Fix #992 2017-07-10 18:49:04 +01:00
modmuss50
0ebd138509
Fix crash with Industrial Foregoing #releaseBuild 2017-07-10 18:44:33 +01:00