Commit graph

2587 commits

Author SHA1 Message Date
drcrazy
e26d7e3a0c Fixed tooltip issue. Closes #865 2017-09-07 18:29:52 +03:00
drcrazy
30ee947c22 Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
drcrazy
015fd889f2 More luv to computer cube block 2017-09-07 01:04:20 +03:00
drcrazy
bc390fa0e0 Fixed missing nuke textures 2017-09-07 00:13:37 +03:00
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
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
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
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
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
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
c926f41237
Fix small issue with ore dict utils 2017-07-10 18:38:30 +01:00
modmuss50
d267bb4e09
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-07-10 18:33:07 +01:00
modmuss50
b4f1031d44
Should fix crash with industrial foregoing 2017-07-10 18:32:34 +01:00
Eric Schneider
71cc854d85 Fixed spelling (#1193) 2017-07-09 20:36:41 +01:00
Eric Schneider
b178fd3442 Fixed grammar (#1192) 2017-07-09 13:13:15 +01:00
modmuss50
2206c7688a
One ingot -> 1 plate, closes #1188 2017-07-08 19:01:03 +01:00
modmuss50
de323b847a
Add Pyrotheum to fluid gen + clean up fluid handling, closes #1054 2017-07-07 00:02:14 +01:00
modmuss50
cead631367
Added a generous amount of recipes into thermal expansion, close #1110 2017-07-06 23:49:00 +01:00
modmuss50
41312c86a5
Add redgarnet recipe 2017-07-06 22:23:14 +01:00
modmuss50
b0987a3ae0
Remove invalid recipes, closes #1183 2017-07-04 16:56:53 +01:00
modmuss50
3e4cf9b93f
Fix server kicking client when using the saw mill, closes #1182 #releaseBuild 2017-07-03 21:51:17 +01:00
modmuss50
79a8fa647b
Rewrite the sawmill logic, fixes #1180 2017-07-03 20:26:55 +01:00
modmuss50
407aa3ed66
Fixes #1177 2017-07-03 19:52:28 +01:00
modmuss50
1e890ab79e
Fixes #1178 2017-07-03 19:48:21 +01:00
modmuss50
d92cbe67e1
Work on some basic advancements 2017-07-03 19:44:15 +01:00
modmuss50
3625521c20
Fixes #1179 2017-07-03 19:12:11 +01:00
Prospector
4601a27193 Update tool.json 2017-07-02 10:39:01 -07:00
modmuss50
faddc0089e
Fix rollingmachine closes #1174 2017-07-02 18:12:57 +01:00
modmuss50
2529f3fd9a
Try and prevent invalid ore dict names being registered 2017-07-01 19:27:07 +01:00
modmuss50
83a1bddf9e
Add recipes for some things that are missing them 2017-07-01 13:33:55 +01:00
modmuss50
ea158a22d4
Rename Electronic Crafting Table to Auto Crafting Table 2017-07-01 13:03:50 +01:00
modmuss50
b803f1762a
Improve machine sound 2017-07-01 13:03:04 +01:00
modmuss50
6995f42924
Work on machine sounds 2017-07-01 12:28:57 +01:00
modmuss50
5efd8daab1
Auto crafting table sound 2017-07-01 12:09:35 +01:00
modmuss50
9a7ffce98e
Nerf windmill recipes, closes #1154 2017-07-01 11:57:02 +01:00
modmuss50
a952ad1fff
Fixes iron furnace sideded issues, closes #1166 2017-07-01 11:52:33 +01:00
modmuss50
0388f97873
Revert: Small improvements to the cables 2017-06-30 13:17:06 +01:00
modmuss50
2774407307
Fix solar panel recipe 2017-06-30 13:07:46 +01:00
modmuss50
3e5f02ab4e
Small improvements to the cables 2017-06-29 17:19:34 +01:00
modmuss50
5203ad5b01
Debug tool supports FU 2017-06-29 16:44:49 +01:00
modmuss50
81aee77869
Fix energy storage blocks not rotating 2017-06-29 16:03:22 +01:00
modmuss50
4207532ded
Fixes https://github.com/TechReborn/TechReborn/issues/1160 2017-06-29 15:49:34 +01:00
modmuss50
ae71797d28
Draw default background on GUI's might help fix some issues 2017-06-29 13:11:59 +01:00
modmuss50
9edbdf5016
Closes https://github.com/TechReborn/TechReborn/issues/1158 for now 2017-06-29 12:56:33 +01:00
modmuss50
0d4fced8bb
Fixes https://github.com/TechReborn/TechReborn/issues/1159 2017-06-29 12:50:23 +01:00
modmuss50
0e8505b072
Remove reminents of core mod + fix powered items 2017-06-29 12:37:06 +01:00
modmuss50
774fec221e
Auto format code 2017-06-28 20:54:12 +01:00
modmuss50
c0aab7f37a
Update crafttweaker support 2017-06-28 20:50:00 +01:00
modmuss50
425a8d2948
Remove 2nd pass of mixin loading, and attempt to fix mixin loading outside dev 2017-06-28 09:15:22 +01:00
modmuss50
36e85c82a3
Update to support reborn core mixin changes. 2017-06-26 23:00:43 +01:00
modmuss50
ac7a4246f6
Fixes the auto crafting table, as it broke a bit with the forge update. 2017-06-26 22:30:13 +01:00
modmuss50
f2c753cf1d
Update to new forge, #releaseBuild 2017-06-26 09:40:58 +01:00
modmuss50
f56ffa9eed
Fix a bunch of issues with recipes 2017-06-25 14:15:01 +01:00
modmuss50
a774b2bcb2
Update to support forge model changes, #releaseBuild 2017-06-25 13:56:39 +01:00
modmuss50
ba644982fe
Update to support new forge registry system 2017-06-24 20:15:49 +01:00
Nourepide
c8dfcb3ba5 Fix missing names in JEI (#1149)
* Fix missing names in GUI machines

* Fix missing names in JEI
2017-06-23 14:05:44 +01:00
Nourepide
4725541a4b Fix missing names in GUI machines (#1147) 2017-06-22 23:30:23 +01:00
modmuss50
138de281f4
Fixes issue with cable crafting, #betaBuild 2017-06-22 20:27:05 +01:00
Nourepide
81f9d46b88 Language: Fixing missing names and removing unused code 2017-06-22 20:47:42 +04:00
Nourepide
56ab571f6d Settings language fix 2017-06-22 19:05:08 +04:00
bogger33
2c9b808670
add dustAsh oreDict recipe (#1128)
(cherry picked from commit 61ad7ee)
2017-06-22 13:05:08 +01:00
modmuss50
7bbb23c876
Fix drill being able to break bedrock, and slow it down slightly 2017-06-22 12:58:43 +01:00
modmuss50
8cf46ef273
Fix extracting from the auto crafting table. 2017-06-22 12:51:28 +01:00