drcrazy
4fc45221a2
Removed scrapboxlist usage. Closes #1407
2018-01-17 13:53:25 +03:00
modmuss50
1bfb5d5604
Fix crash with Fusion Control computer, fixes part of #1395
2018-01-12 19:51:06 +00:00
drcrazy
4332e8852f
TR part for #1402 done. RC to go.
2018-01-10 15:57:58 +03:00
modmuss50
268a16958b
Format + license headers.
2018-01-08 18:29:12 +00:00
modmuss50
2a0a9e5636
Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm
2018-01-08 17:45:29 +00:00
Dimmerworld
86d37514a7
Recipe for alarm and misc fixes
2018-01-03 15:17:20 +11:00
Dimmerworld
2177b72e41
Animation
2018-01-03 14:26:23 +11:00
modmuss50
3e8cf290bf
Fixes crash with auto crafting table.
2017-12-29 17:09:19 +00:00
modmuss50
9ff30a4344
Add support for charging FE based items
2017-12-28 14:53:56 +00:00
Modmuss50
cbcb465c97
Added support for individual slot configuration
...
* start work on slot config
* More slot work
* More gui work for slot config
* Remove old sided code
* More slot work
* More slot memes
* Stuff seems to be working :)
* Start work on auto input / output
* Slot IO check boxes now work
* Fix buttons at different screen resolutions
* Improve close button
* Gui polish
* Fix multiblock hologram rendering
* More fixes + changes
* Cleanup + output fix
2017-12-25 00:18:43 +00:00
modmuss50
5a40749bcd
Fixed #1364
2017-12-22 12:51:16 +00:00
modmuss50
7ab59db7c0
Improve idle auto crafting table tick time, more work still needs to be done. Closes #1374
2017-12-19 23:50:38 +00:00
modmuss50
7594b55fb5
Start work on the alarm
2017-12-18 19:58:52 +00:00
modmuss50
7f289e2356
Add ic2 item discharge support, closes #1357
2017-12-17 21:36:48 +00:00
modmuss50
82eb0f62d6
Fixes #1354
2017-12-17 21:24:25 +00:00
drcrazy
376f02df26
Updated Sawmill GUI and TileEntity.
2017-12-13 12:29:39 +03:00
drcrazy
1d18740215
Fixed rotation for solar panels. Closes #1358
2017-12-11 12:03:20 +03:00
modmuss50
53c731d678
Handful of improvements to the electrical furnace, closes #1349
2017-12-04 20:55:57 +00:00
drcrazy
777707373a
Fixed cells piping into Industrial Grinder.
2017-12-04 23:10:33 +03:00
drcrazy
2f54305f6d
Added filter for fluidSlot. Closes #1352
2017-12-04 22:34:34 +03:00
drcrazy
df24adb936
Made solar panel wrenchable
2017-12-01 19:24:02 +03:00
drcrazy
6202b46cf7
Fixed unused imports
2017-12-01 19:04:30 +03:00
drcrazy
f6fca1c623
Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles
2017-11-29 17:13:36 +03:00
modmuss50
4d043faa27
Fixes #1344
2017-11-29 09:35:00 +00:00
drcrazy
eab088c094
Merge branch '1.12' into feature/solar-panles
...
Conflicts:
build.gradle
src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
src/main/java/techreborn/blocks/lighting/BlockLamp.java
2017-11-28 17:28:47 +03:00
Alistair Buxton
642e6b0f2b
Implement powered lighting.
2017-11-28 15:37:32 +03:00
drcrazy
34913c4817
Added config for several multiblock machines.
2017-11-28 15:23:32 +03:00
drcrazy
779551cf70
Fixed JavaDoc and CTScrapbox warnings
2017-11-27 17:55:29 +03:00
modmuss50
e2f177b757
Can now charge ic2 items, closes #1202
2017-11-27 13:34:45 +00:00
modmuss50
def8cb5355
Fix dupe bug, Fixes https://github.com/TechReborn/TechReborn/issues/1342
2017-11-18 20:37:14 +00:00
drcrazy
64495919c0
Added config for transformers to follow IC2 style. Closes #1326
2017-11-14 14:34:14 +03:00
drcrazy
150fb2a2c4
Fixed iron furnace fuel slot shift-click in ugly way. Closes #968
2017-11-13 13:46:20 +03:00
drcrazy
9d1e64b1b2
Fixed texture error for fluid itemblocks.
2017-11-13 02:14:44 +03:00
drcrazy
bf5b649fc4
Removed unused code, added Override annotation
2017-11-12 12:15:32 +03:00
drcrazy
5bfe649360
Added coils check in onLoad. Closes #1337
2017-11-08 03:16:51 +03:00
drcrazy
8cacd3d8d1
Limited LESU max storage to MAX_INT FE or MAX_INT/4 EU. Closes #1328
2017-11-08 01:48:11 +03:00
Alistair Buxton
c6ac9110fe
Implement powered lighting.
2017-11-04 07:31:07 +00:00
modmuss50
c0fc388a01
I tried to fix item rendering issues, but failed.
2017-10-27 09:40:11 +03:00
modmuss50
e0edff6891
Some more work on solar panels.
2017-10-27 09:40:10 +03:00
modmuss50
0aa8974035
Fix some issues with the solar panels
2017-10-27 09:40:09 +03:00
Dimmerworld
3fe609e207
Fix poweroutput
2017-10-27 09:40:08 +03:00
Dimmerworld
9972822acd
Drcrazy fixes
2017-10-27 09:40:07 +03:00
drcrazy
c7f599ead1
Merge with upstream
2017-10-27 09:39:31 +03:00
Dimmerworld
60426c4cc1
canSeeSky reduced to every 20 ticks @Modmuss request
2017-10-27 09:35:02 +03:00
Dimmerworld
37de6f6a6d
Justifications
2017-10-27 09:35:01 +03:00
Dimmerworld
d4c941cb5a
Modmuss50 changes
...
ID removed
Configs removed
Private Enum buffer removed
2017-10-27 09:35:00 +03:00
Dimmerworld
5396551891
Revert "Update to latest commit(Master)"
2017-10-27 09:34:58 +03:00
Dimmerworld
8a5df0fc4b
Texture readd, classes unaltered and debug message removed
2017-10-27 09:34:57 +03:00
Dimmerworld
5d0b5c3ea3
Balance, textures and items
2017-10-27 09:34:55 +03:00
Dimmerworld
4205beaead
Balance and null fix
2017-10-27 09:34:54 +03:00
Dimmerworld
74b8246b39
More work on tile entity
2017-10-27 09:34:51 +03:00
Dimmerworld
fed439307e
Tile entity work
2017-10-27 09:34:50 +03:00
Dimmerworld
c4711848ae
Textures and block work.
2017-10-27 09:34:49 +03:00
Dimmerworld
c651363b73
Update to latest commit(Master)
2017-10-27 09:34:47 +03:00
drcrazy
c8b6edd390
Updated LESU. Closes #1322
2017-10-26 02:26:07 +03:00
drcrazy
440c089b5f
Fixed scrapbox list of outputs. Closes #1317 . I hope )
2017-10-24 15:09:53 +03:00
modmuss50
3901d60545
Some work on charging ic2 items, moving back to a proper pc.
2017-10-22 18:23:58 +01:00
drcrazy
7d7340111d
Added Distillation tower. Closes #884
2017-10-16 15:52:10 +03:00
drcrazy
47134cf2ab
Added plasma generator. Some work on #884
2017-10-13 03:20:34 +03:00
modmuss50
31f3aff11f
Remove ghost upgrade slots on some machines.
2017-10-12 21:51:07 +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
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
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
18be69aaf7
Improve tank server->client syncing, closes https://github.com/TechReborn/TechReborn/issues/1291
2017-10-08 19:28:52 +01:00
drcrazy
1177b693f7
Fixed IDSU not charging items
2017-10-08 02:41:54 +03:00
drcrazy
ca829c18cc
Added wrench support
2017-10-08 00:04:08 +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
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
1b4fee595d
Fixed warnings
2017-09-30 03:58:01 +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
40e470629d
Added check for config for block break with pickaxe. Closes #1172
2017-09-28 02:03:16 +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
drcrazy
7ab16224a5
Fixed existing cable bug. Introduced new. Closes #1240
2017-09-18 01:25:01 +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
5d441defa7
Update IndustrialElectrolyzer GUI to GuiBase. Closes #1272 .
...
Also started JEI refactoring
2017-09-13 03:40:38 +03:00
drcrazy
5b09618ad2
Fix double tile entity update
2017-09-10 01:15:07 +03:00
alexpic57
c1dd9d9192
fix all? the tile to prevent bug duplication
2017-09-08 21:39:46 +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
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
alexpic57
93b869a446
fix background not showing on somes machines
2017-09-06 14:42:54 +02: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
07b1724e24
Updated max energy storage for several tools. Closes #1219
2017-09-01 16:19:59 +03:00
modmuss50
6f6800e75a
Rewrite wrench to use new API
2017-08-30 21:57:14 +01: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
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
94795b7d42
Fix Vacuum Freezer wrench drop. Closes #1196 ( #1235 )
2017-08-14 12:46:38 +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
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
5efd8daab1
Auto crafting table sound
2017-07-01 12:09:35 +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
3e5f02ab4e
Small improvements to the cables
2017-06-29 17:19:34 +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
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
774fec221e
Auto format code
2017-06-28 20:54:12 +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
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
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
0e9c61bd60
Fix slot alignment in autocrafting Gui
2017-06-21 10:00:53 +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
Prospector
b80235504f
Fix the rest of the models & remove manual and heat generator
2017-06-16 08:20:30 -07:00
modmuss50
a701094d1d
Update all license headers
2017-06-15 12:28:26 +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