Commit graph

2895 commits

Author SHA1 Message Date
drcrazy
c0a43c0947 Icons for armor slots 2017-10-23 16:02:58 +03:00
modmuss50
3901d60545 Some work on charging ic2 items, moving back to a proper pc. 2017-10-22 18:23:58 +01:00
modmuss50
1c6336eb68 Add grinder support to CT, closes https://github.com/TechReborn/TechReborn/issues/1318 2017-10-22 18:12:31 +01:00
drcrazy
26ddc03a65 Added background icon for upgrade slots 2017-10-21 02:07:06 +03:00
drcrazy
a57c09f633 Added ability to remove single\all scrapbox outputs. Closes #1305 2017-10-20 23:09:05 +03:00
drcrazy
30090b53dc Small fixes to ru_ru translation 2017-10-20 12:16:58 +03:00
SkyFire55
7e4f2ebc6c Russian language support update (#1315)
* Russian language support update

* Different translation fixes
2017-10-20 12:09:45 +03:00
drcrazy
5702e79e7a Do net reset block break progress upon item charge. Closes #1312 2017-10-20 03:00:28 +03:00
drcrazy
441ac4887a Made Cloaking device wearable in 1.12. Closes #1314 2017-10-20 01:58:35 +03:00
drcrazy
3f1e7b9111 Fixed transformer upgrade name. Closes #1313 2017-10-19 12:20:56 +03:00
Alistair Buxton
e43a4dbf3c Don't place a block when opening energy store GUI. 2017-10-17 07:25:20 +01:00
drcrazy
7d7340111d Added Distillation tower. Closes #884 2017-10-16 15:52:10 +03:00
drcrazy
4c8a9fb7e8 Textures for solar panels 2017-10-16 01:49:05 +03:00
drcrazy
c4916f5c7e Fixed model loading errors for sapling and plates 2017-10-15 02:00:13 +03:00
drcrazy
7b4178eba8 Fixed sapling startup error message 2017-10-13 18:20:04 +03:00
drcrazy
2fd8df2118 Added CT support for plasma generator 2017-10-13 17:41:29 +03:00
drcrazy
ae1dfe4e45 Fixed warning related to deprecated JEI compat. 2017-10-13 13:31:11 +03:00
modmuss50
62251e7842 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-13 11:07:26 +01:00
modmuss50
a26d11ee51 Fix small issue with TOP support. 2017-10-13 11:07:18 +01:00
drcrazy
47134cf2ab Added plasma generator. Some work on #884 2017-10-13 03:20:34 +03:00
modmuss50
eb6098de5d Re-enable retro gen support (beta), let me know of any issues. Closes #1162 2017-10-12 22:12:09 +01:00
modmuss50
09969559e8 Add fluid gen support to CT, closes #1153 2017-10-12 22:10:41 +01:00
modmuss50
46f011ef69 Remove upgrades from the dedupe list, fixes #1302 2017-10-12 21:55:41 +01:00
modmuss50
31f3aff11f Remove ghost upgrade slots on some machines. 2017-10-12 21:51:07 +01:00
modmuss50
79984ab107 Fixes #1295 2017-10-12 21:32:53 +01:00
modmuss50
e490669405 Fixes CraftTweaker support, closes #1303 2017-10-12 21:19:51 +01:00
modmuss50
b7b9cb9963 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-12 17:50:13 +01:00
modmuss50
984e9eb2f2 Improve TOP support 2017-10-12 17:50:03 +01:00
drcrazy
416361ff3b Increased internal buffer for cable to x6 of transfer rate. Closes #1296 2017-10-12 18:23:50 +03:00
drcrazy
b80bf1240d Updated cable to push energy to other cables. Closes #1296 2017-10-12 02:05:20 +03:00
modmuss50
fd5af79496 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-11 17:42:36 +01:00
modmuss50
23ccd878bd Fix rolling machine CT 2017-10-11 17:42:27 +01:00
drcrazy
ae27bf7b9f Added multiblock hologram to Vacuum Freezer. Closes #1297 2017-10-11 17:24:36 +03:00
modmuss50
610c2e479e Small tile cleanup + small fixes for potential issues. 2017-10-11 13:04:09 +01:00
modmuss50
c80cc0101f Allow changing of the power cost view in fusion reactor recipes. 2017-10-11 12:56:29 +01:00
modmuss50
55b09da681 Fix fusion reactor not using its starting power. 2017-10-11 12:44:42 +01:00
drcrazy
79c66e2349 Suppressed warning for old upgrade slots 2017-10-11 11:28:04 +03:00
drcrazy
5d38337caa Fixed unused variable warning 2017-10-11 11:20:42 +03:00
drcrazy
751be69426 Fixed warnings for IronAlloyFurnace (checkBurningTime, updateEntity) 2017-10-11 11:18:42 +03:00
drcrazy
5961ce5961 Fixed warning by hasContainerItem() 2017-10-11 10:52:12 +03:00
drcrazy
3945a961ef Replaced direct FMLLog usage with LogHelper 2017-10-11 10:40:45 +03:00
drcrazy
387d4287de Fixed warnings for VersionChecker by removing it ) 2017-10-11 02:07:08 +03:00
drcrazy
8692bef2bb Little polish to AESU GUI 2017-10-11 01:59:25 +03:00
drcrazy
e81fc202ad Added AESU logic 2017-10-11 00:49:12 +03:00
drcrazy
58aac2ce0b Updated AESU GUI 2017-10-10 00:13:08 +03:00
modmuss50
45d2df8650 Fix #1293 again 2017-10-09 13:23:41 +01:00
modmuss50
18be69aaf7
Improve tank server->client syncing, closes https://github.com/TechReborn/TechReborn/issues/1291 2017-10-08 19:28:52 +01:00
modmuss50
62366c8085
Fixes #1293 2017-10-08 18:58:00 +01:00
modmuss50
a590fd8ee1
Should fix #1289 2017-10-08 18:56:07 +01:00
drcrazy
1177b693f7 Fixed IDSU not charging items 2017-10-08 02:41:54 +03:00
drcrazy
350d3589c9 Fix warnings for subitemtype instead of supressing it 2017-10-08 01:59:28 +03:00
drcrazy
ca829c18cc Added wrench support 2017-10-08 00:04:08 +03:00
drcrazy
12e2cbe11b Fixed textformatting warnings 2017-10-07 14:39:30 +03:00
modmuss50
a80409c138 Some small tweaks to the auto crafting table, closes #1286 2017-10-04 15:19:45 +01:00
modmuss50
4e536718a3 Large changes to allow the Electrical Furnace to be upgraded 2017-10-04 13:35:58 +01:00
Modmuss50
db636be12c Merge pull request #1285 from Dimmerworld/Scrapboxinator
Made Scrapboxinator functional to an extent
2017-10-04 11:07:10 +01:00
Dimmerworld
28010d0790 Make scrapboxinator great again!
Fix input/output
Greatly reduced process time
Removed any sign of upgrades
Remove WIP tag
Add crafting recipe 
Cleaned up unused imports

Recipe:
(ironplate|circuit|ironplate)
(dirt|scrapbox|dirt)
(ironplate|circuit|ironplate)
2017-10-04 21:02:51 +11:00
modmuss50
965d74d641 Improvements to the iron furnace, closes #1016 2017-10-04 10:12:15 +01:00
Dimmerworld
4c1d011544 Made Scrapboxinator functional to a extent
Fix progressbar flicker(Major one)
Opens the scrapbox now and has a vaild output
2017-10-04 15:37:09 +11:00
modmuss50
e5e05d0afd Chainsaw chops down the entire tree 2017-10-03 17:39:33 +01:00
modmuss50
f00214f7de Rewrite item power distribution to support fe. should fix #1260 2017-10-03 17:02:58 +01:00
modmuss50
81264e0fe2 Add back cable damage, closes #1150 2017-10-03 13:24:51 +01:00
drcrazy
369a19b239 Updated alloy smelter GUI to use guiBase 2017-10-03 14:44:08 +03:00
drcrazy
08c2f8921e Add ability to insert\extract from fusion reactor. Closes #1237 2017-10-02 21:08:05 +03:00
drcrazy
0ae99ebae8 Keep state for running reactor. Closes #1187 2017-10-02 18:38:47 +03:00
drcrazy
1c57bd0100 MOre fixed warnings 2017-10-01 03:15:58 +03:00
drcrazy
1c95ca4967 Fixed warnings for Location and getStateFromMeta 2017-10-01 03:03:05 +03:00
drcrazy
1b4fee595d Fixed warnings 2017-09-30 03:58:01 +03:00
drcrazy
b10459a288 Updated Diesel generator recipes. Closes #1279 2017-09-30 03:03:55 +03:00
drcrazy
0e5ab26cf0 Moved check for power acceptors to earlier stage. Closes #1281 2017-09-30 01:29:26 +03:00
drcrazy
bfa0c8f80a Fixed energy usage from IDSU. Closes #1282 2017-09-30 00:45:25 +03:00
drcrazy
6f96dd7c2b Renamed files to fix startup messages 2017-09-29 02:22:05 +03:00
modmuss50
f5076ea8af Downgrade mappings + update all libs 2017-09-28 23:44:16 +01:00
drcrazy
4ce046a2ac Added recipe for DragonEgg Syphon 2017-09-29 01:08:31 +03:00
modmuss50
17b09b882a Fix build issues 2017-09-28 22:44:55 +01:00
modmuss50
8bf7bce11c Fix merge issue 2017-09-28 21:09:15 +01:00
modmuss50
e51f3f7c51 Merge remote-tracking branch 'origin/1.12' into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
2017-09-28 21:04:02 +01:00
modmuss50
2e1c469524 Add support for wrenches from other mods. 2017-09-28 21:01:38 +01:00
drcrazy
40e470629d Added check for config for block break with pickaxe. Closes #1172 2017-09-28 02:03:16 +03:00
modmuss50
ffe13d0c79 Update rolling machine CT support for 1.12 closes #1251 2017-09-27 13:45:49 +01:00
drcrazy
3010afa351 Fix to-do 2017-09-27 02:56:24 +03:00
drcrazy
02473d4585 Fix warnings 2017-09-25 17:52:45 +03:00
drcrazy
ae75191c00 Fixed check for max storage for chests. Closes #1026 2017-09-22 04:03:20 +03:00
drcrazy
833974d698 Fixed inventory drop for chests. Closes #1239 2017-09-20 02:26:37 +03:00
drcrazy
8a1d9c78eb Dirty fix for empty itemstack. Closes #1255 2017-09-19 15:11:00 +03:00
modmuss50
e74067db40 1.12.2 2017-09-18 23:47:07 +01:00
drcrazy
7ab16224a5 Fixed existing cable bug. Introduced new. Closes #1240 2017-09-18 01:25:01 +03:00
drcrazy
cd7b008430 Fixed missing ender eye and pearl grinder recipes 2017-09-17 21:00:15 +03:00
drcrazy
be88077f8c #releaseBuild 2017-09-16 01:06:26 +03:00
drcrazy
01c04c27bb Some machines can use batteries now 2017-09-16 00:50:43 +03:00
drcrazy
4ccd3ff290 Fixed lava check inside blast furnace multiblock 2017-09-15 02:10:55 +03:00
drcrazy
c43077e640 Fixed blast furnace double energy tap. Closes #1273 2017-09-15 01:54:09 +03:00
drcrazy
8de19ff5e7 Fix warnings 2017-09-14 17:55:28 +03:00
drcrazy
da399fc916 Fix empty check 2017-09-14 10:30:41 +03:00
drcrazy
f39026b959 JEI integration refactoring 2017-09-13 13:27:33 +03:00
drcrazy
5d441defa7 Update IndustrialElectrolyzer GUI to GuiBase. Closes #1272.
Also started JEI refactoring
2017-09-13 03:40:38 +03:00
drcrazy
7cc8a4985f Fix plate iridium alloy name. Closes #1271 2017-09-11 23:15:59 +03:00
modmuss50
b18f99a4dd Fix server crash 2017-09-11 09:28:45 +01:00
drcrazy
5b09618ad2 Fix double tile entity update 2017-09-10 01:15:07 +03:00
drcrazy
b13d282bf1 Fix unused imports 2017-09-09 01:54:43 +03:00
alexpic57
c1dd9d9192 fix all? the tile to prevent bug duplication 2017-09-08 21:39:46 +02:00
alexpic57
53adc8142e remove wrong import 2017-09-08 21:25:13 +02:00
alexpic57
885ba9210c fix bug duplication #1012 2017-09-08 21:18:57 +02:00
alexpic57
1d873c2d33 fix identation + remove unused import + fix jei button on ImplosionCompressor 2017-09-08 13:58:27 +02:00
alexpic57
e4b5d3378a update Implosion Compressor to GuiBase 2017-09-08 09:48:55 +02:00
drcrazy
aa2df32222 Fix build 2017-09-08 02:11:49 +03:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +03:00
drcrazy
8a8205b4b1 Change eupertick to 0.1. Closes #1176 2017-09-07 18:31:20 +03:00
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
modmuss50
b083d6b5fc
Fix custom recipe support 2017-06-22 12:46:02 +01:00
modmuss50
412d66593b
Large amount of work toward being able to place the recipe into the gui. 2017-06-22 00:29:57 +01:00
modmuss50
bee8d4aab0
Some minor fixes to the auto crafting table 2017-06-21 23:39:40 +01:00
modmuss50
ba99f70406
Auto fill grid in the correct patten 2017-06-21 23:31:40 +01:00
modmuss50
04721e447d
Start work on intelligent item insertion. 2017-06-21 20:26:56 +01:00
modmuss50
43d741d4b6
Fix language names 2017-06-21 17:39:52 +01:00
modmuss50
24efcf057f
Fix lesu missing texture. 2017-06-21 17:36:36 +01:00
modmuss50
10c48aaadd
Partially revert LESU name change. 2017-06-21 17:32:19 +01:00
modmuss50
3a0c5a6f31
Fix crash with auto crafter 2017-06-21 17:13:07 +01:00
modmuss50
9477797ec7
Save recipe to nbt 2017-06-21 17:05:48 +01:00
modmuss50
944d2b7b5c
Fix some small issues 2017-06-21 16:35:15 +01:00
modmuss50
6982342dc0
Basic auto crafting logic 2017-06-21 16:22:57 +01:00
modmuss50
6bba67640c
Textures for auto crafting table 2017-06-21 15:51:31 +01:00
modmuss50
a3c4b9f3ed
Show the recipe in the autocrafting gui 2017-06-21 15:25:18 +01:00
modmuss50
0e9c61bd60
Fix slot alignment in autocrafting Gui 2017-06-21 10:00:53 +01:00
modmuss50
e962f44fb3
Work on the auto crafting gui 2017-06-21 09:47:36 +01:00
modmuss50
82aa0e730f
Update forge and mappings to latest 2017-06-21 09:07:36 +01:00
modmuss50
543f3fbdc9
Fix leaf rendering 2017-06-20 22:13:47 +01:00
modmuss50
53ac9e44c1
Fix generator localised name 2017-06-20 22:06:17 +01:00
modmuss50
1bc724ebfc
Disable dev features by default 2017-06-20 22:04:39 +01:00
modmuss50
59a92a43c6
Remove "expensive" recipe configs, and they had no point to be there. 2017-06-20 22:01:00 +01:00
modmuss50
dd2e21d8bc
Fixes solar panel and grinder recipes. (will need to delete recipes config) 2017-06-20 21:59:26 +01:00
modmuss50
86d4daaea7
inv stuff 2017-06-20 21:38:51 +01:00
modmuss50
a7316bc6c0
More auto crafting table stuff 2017-06-20 21:31:21 +01:00
modmuss50
3071d19db0
Initial work on Auto crafting table. 2017-06-20 18:54:45 +01:00
modmuss50
7eaef93136
Fix server start-up crash, #betaBuild 2017-06-18 14:14:42 +01:00
Prospector
f05221d1ef Fix a couple unlocalized names 2017-06-16 08:30:13 -07:00
Prospector
b80235504f Fix the rest of the models & remove manual and heat generator 2017-06-16 08:20:30 -07:00
Prospector
977e0657ff Fix rubber tree stuff models 2017-06-16 07:32:11 -07:00
IvanSteklow
fb0b4b54cf Create ru_ru.lang (#1137) 2017-06-15 14:41:41 +01:00
modmuss50
a701094d1d
Update all license headers 2017-06-15 12:28:26 +01:00
modmuss50
24faea17ba
Fixes issue in recipes + update forge 2017-06-15 12:07:03 +01:00
modmuss50
ae0fa1abd7
Fix a large bunch of lang entry's 2017-06-15 11:42:53 +01:00
modmuss50
aa615f86bd
Recipes are now added to the recipe book when a tree tap is used. 2017-06-15 11:35:08 +01:00
modmuss50
5536a6cd94
Recipes can now show in the recipe book 2017-06-15 11:01:33 +01:00
Prospector
bdcb8bf327 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12 2017-06-15 00:01:51 -07:00
Prospector
cc27a1ed14 More WIP 2017-06-15 00:01:37 -07:00
modmuss50
5570a52539
Sawmill recipes work again 2017-06-14 23:50:49 +01:00
modmuss50
426001251f
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2017-06-14 23:30:35 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing. 2017-06-14 22:50:20 +01:00
Prospector
40e3062903 Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP) 2017-06-14 08:56:09 -07:00
Prospector
1fa9f1cf52 Begin the Great Refactor of Mid-2017 2017-06-13 16:49:52 -07:00
modmuss50
a4a4042eb1
Fix #775, The oldest open bug, and it only took me 5 mins 2017-06-13 22:37:03 +01:00
modmuss50
708ccc758a
Mappings update 2017-06-13 22:07:49 +01:00
modmuss50
3400f42962
Lighten the oil texture, might revert it im not sure? 2017-06-13 21:27:06 +01:00
modmuss50
9619ada825
Added underground oil lakes 2017-06-13 21:16:17 +01:00
modmuss50
2292741443
Update walia support 2017-06-13 20:37:17 +01:00
modmuss50
cb0303d82f
Remove old int tiers 2017-06-13 20:28:50 +01:00
modmuss50
b1721890b5
Transformer improvements 2017-06-13 20:26:23 +01:00
modmuss50
1de4c4ff2b
Remove upgrade slots from Energy Storage blocks 2017-06-13 19:46:47 +01:00
modmuss50
c51b74fd68
Small fixes to the IDSU 2017-06-13 19:43:27 +01:00
modmuss50
5dd9fb14a1
Fixes item tool tips not rendering in gui's 2017-06-13 17:36:33 +01:00
modmuss50
70a2755796
Fix IDSU saving 2017-06-13 17:22:29 +01:00
modmuss50
44817f1a03
Use WorldStorage, but it still doesn't save :/ 2017-06-13 16:11:41 +01:00
modmuss50
f90bb45351
Move idsu manger to use capability's 2017-06-13 16:02:49 +01:00
modmuss50
14e30481e5
Improve IDSU 2017-06-13 13:14:02 +01:00
modmuss50
c4868a3264
Changes to the LightningRod 2017-06-13 13:03:32 +01:00
modmuss50
3829e83459
Fixes #1131 2017-06-13 12:48:31 +01:00
modmuss50
df62000513
Found some more null itemstacks 2017-06-13 11:26:08 +01:00
modmuss50
c3c0a0421d
Lower generator output 2017-06-12 21:02:22 +01:00
modmuss50
2df2a1d1ba
Remove old config system 2017-06-12 20:51:36 +01:00
modmuss50
fed253332b
Move ore config, and use normal gson 2017-06-12 20:44:10 +01:00
modmuss50
50bb4ea7a9
More configs! 2017-06-12 20:38:43 +01:00
modmuss50
b7e141e004
More config changes 2017-06-12 20:33:30 +01:00
modmuss50
0cf3e43992
Update to support RC changes 2017-06-12 20:06:15 +01:00
Prospector
f3726fd174 Update cable item textures 2017-06-12 10:40:35 -07:00
Prospector
11527b3a22 Fix cable models 2017-06-12 10:25:29 -07:00
modmuss50
e0c39a4777
Fix Creative tab issue 2017-06-12 17:30:21 +01:00
modmuss50
7426d83900
Remove broken VeinGenerator 2017-06-12 14:40:30 +01:00
modmuss50
cf5ed6afa0
Remove stupid/unused configs 2017-06-12 14:39:06 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
fc4d8686b8
Support RC changes 2017-06-12 14:19:16 +01:00
modmuss50
e0f63fd0c5
Try and fix cable inv rendering 2017-06-12 11:17:57 +01:00
modmuss50
624d8fb93a
Remove old cables 2017-06-12 10:55:26 +01:00
modmuss50
007e8714fa
Improvements to cables. 2017-06-12 10:47:38 +01:00
modmuss50
7a8a152911
Fix GUI's having a floating button 2017-06-12 10:28:57 +01:00
modmuss50
41c94b2a52
Fix CreativeSolar panel smoking when pushing power. 2017-06-12 09:52:43 +01:00
modmuss50
06d366b941
Update Gradle + JEI compact 2017-06-12 09:48:52 +01:00
modmuss50
29cf9fa90b
1.12 2017-06-11 21:22:07 +01:00
Prospector
b6cf2a2c59 Remove a few old configs 2017-06-09 10:35:54 -07:00
Prospector
81f701477c Fix compile 2017-06-09 08:47:44 -07:00
Prospector
2d5d60be6b Do more configs. Still a lot to go 2017-06-09 08:31:19 -07:00
modmuss50
cba5fff3c2
Remove new cable from JEI blacklist 2017-06-09 15:11:59 +01:00
modmuss50
c7419ee8ac
Update to support new RC teir calculations 2017-06-09 14:53:24 +01:00
Prospector
2b7868c651 More configs & start fixing cable models 2017-06-08 19:12:58 -07:00
Prospector
ad36dfcddb Started redoing config 2017-06-08 11:45:30 -07:00
modmuss50
2eac072a92
Update to fix compile issues with new JEI api 2017-06-08 11:13:01 +01:00
modmuss50
0aafea9758
Should fix issues with recipes not being removed from JEI when using CT, closes #1121 and closes #1118 2017-06-06 12:56:50 +01:00
modmuss50
968cb057e1
Fix matter fab not using all output slots, closes #1101 2017-06-02 20:36:02 +01:00
modmuss50
dd7005dc0a
Disable upgrade slots in electric furnace for now, closes #1064 2017-06-02 20:32:55 +01:00
modmuss50
f9d4134365
Start redoing Matter Fabricator gui
(cherry picked from commit 5c6bc6c)
2017-06-02 20:32:03 +01:00
ProfessorProspector
82927ae405
Start redoing Matter Fabricator gui
(cherry picked from commit 5c6bc6c)
2017-06-02 20:23:07 +01:00