Commit graph

506 commits

Author SHA1 Message Date
modmuss50
dc4cdbb9cc
Fixes #1368 2017-12-17 21:53:14 +00:00
drcrazy
6c7f9078ec Secondary gem moved to eventHandler. Closes #1365 2017-12-15 16:43:48 +03:00
drcrazy
a419189926 Added dust->ingot<->block recipes for several materials. Closes #1356 2017-12-08 16:43:04 +03:00
drcrazy
df24adb936 Made solar panel wrenchable 2017-12-01 19:24:02 +03:00
drcrazy
9ac8b31599 Fixed TOP\Waila icon for active machine 2017-11-29 15:23:40 +03: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
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
29d1176861 Fixed casing model with CTM enabled 2017-11-10 01:29:08 +03:00
drcrazy
41dd0468e6 Fixed CTM version of LESU Storage. 2017-11-10 01:21:59 +03:00
drcrazy
19ccbd681d Fixed itemBlock rendering. TOP\Waila are still an issue 2017-11-05 02:32:06 +03:00
Alistair Buxton
c6ac9110fe Implement powered lighting. 2017-11-04 07:31:07 +00: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
d4c941cb5a Modmuss50 changes
ID removed
Configs removed
Private Enum buffer removed
2017-10-27 09:35:00 +03:00
Dimmerworld
8a5df0fc4b Texture readd, classes unaltered and debug message removed 2017-10-27 09:34:57 +03:00
Dimmerworld
4307cb8258 misc fixes 2017-10-27 09:34:56 +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
d3ede81de4 alter 2017-10-27 09:34:48 +03:00
Dimmerworld
c651363b73 Update to latest commit(Master) 2017-10-27 09:34:47 +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
47134cf2ab Added plasma generator. Some work on #884 2017-10-13 03:20:34 +03:00
modmuss50
79984ab107 Fixes #1295 2017-10-12 21:32:53 +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
ca829c18cc Added wrench support 2017-10-08 00:04:08 +03: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
81264e0fe2 Add back cable damage, closes #1150 2017-10-03 13:24:51 +01:00
drcrazy
1c57bd0100 MOre fixed warnings 2017-10-01 03:15:58 +03:00
drcrazy
4ce046a2ac Added recipe for DragonEgg Syphon 2017-09-29 01:08:31 +03: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
drcrazy
3010afa351 Fix to-do 2017-09-27 02:56:24 +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
8de19ff5e7 Fix warnings 2017-09-14 17:55:28 +03:00
drcrazy
b13d282bf1 Fix unused imports 2017-09-09 01:54:43 +03:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +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
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