Modmuss50
|
8060e8df55
|
Merge pull request #1348 from TechReborn/feature/solar-panles
Feature/solar panles
|
2017-12-01 14:25:59 +00:00 |
|
Dimmerworld
|
3c68417fd9
|
Item liquidation (#1347)
We salute our brace comrades:
Solar panel
Compact solar panel
and Quantum singularity
Whom wern't quite ready to be implemented.
|
2017-12-01 17:16:39 +03:00 |
|
drcrazy
|
b2d2be24c6
|
Updated recipies and fixed build
|
2017-11-30 16:46:11 +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 |
|
drcrazy
|
9ac8b31599
|
Fixed TOP\Waila icon for active machine
|
2017-11-29 15:23:40 +03:00 |
|
modmuss50
|
4d043faa27
|
Fixes #1344
|
2017-11-29 09:35:00 +00:00 |
|
modmuss50
|
2603fa5df7
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2017-11-28 17:44:18 +00:00 |
|
modmuss50
|
b8964b6eca
|
Update mappings
|
2017-11-28 17:25:36 +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 |
|
drcrazy
|
703f49752e
|
Updated top texture for solar panels
|
2017-11-28 16:52:14 +03:00 |
|
drcrazy
|
be227b4edb
|
Fixed type in zenclass name. Closes #1332
|
2017-11-28 15:37:38 +03:00 |
|
modmuss50
|
8abfa5cd56
|
#releaseBuild
|
2017-11-28 15:37:36 +03:00 |
|
modmuss50
|
3afe2c8910
|
Add lang names for new lights
|
2017-11-28 15:37:34 +03:00 |
|
Alistair Buxton
|
642e6b0f2b
|
Implement powered lighting.
|
2017-11-28 15:37:32 +03:00 |
|
Modmuss50
|
db9da00fec
|
Don't always push to github
|
2017-11-28 15:37:30 +03:00 |
|
Modmuss50
|
160ab3bb5f
|
Add support for github releases (Testing)
|
2017-11-28 15:37:28 +03:00 |
|
Modmuss50
|
8a114d53ad
|
#releaseBuild
|
2017-11-28 15:37:25 +03:00 |
|
drcrazy
|
34913c4817
|
Added config for several multiblock machines.
|
2017-11-28 15:23:32 +03:00 |
|
drcrazy
|
9a8a7455ff
|
Fixed warning for FusionReactorRecipeWrapper
|
2017-11-27 17:58:37 +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
|
850ec54bd3
|
Bump version #releaseBuild
|
2017-11-27 09:36:06 +00:00 |
|
drcrazy
|
bff9179734
|
Updated multiblock to use BlockPos rather than CoordTriplet
|
2017-11-25 03:30:58 +03:00 |
|
modmuss50
|
9aa3d3e59d
|
Added back buildcraft support
|
2017-11-24 14:59:49 +00:00 |
|
modmuss50
|
def8cb5355
|
Fix dupe bug, Fixes https://github.com/TechReborn/TechReborn/issues/1342
|
2017-11-18 20:37:14 +00:00 |
|
冷风
|
1f224277e5
|
zh_cn.lang (#1341)
* Update zh_cn.lang
* Update zh_cn.lang
* Update zh_cn.lang
|
2017-11-18 12:02:46 +03:00 |
|
drcrazy
|
f1a179d26e
|
#releaseBuild
|
2017-11-15 10:40:28 +03:00 |
|
drcrazy
|
64495919c0
|
Added config for transformers to follow IC2 style. Closes #1326
|
2017-11-14 14:34:14 +03:00 |
|
drcrazy
|
ffe115bee1
|
Fixed iridium oregen. Closes #1330
|
2017-11-13 18:29:16 +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
|
53c8033a99
|
Fixed duplicate registration for basic machine frame. Closes #1340
|
2017-11-13 11:47:15 +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
|
14f715ff7b
|
#releaseBuild
|
2017-11-10 12:59:26 +03:00 |
|
drcrazy
|
3d623292f8
|
Fixed more warnings
|
2017-11-10 12:48:01 +03:00 |
|
drcrazy
|
25d561c81c
|
Fixed imports and suppressed recipe warnings.
|
2017-11-10 12:27:31 +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
|
5bfe649360
|
Added coils check in onLoad. Closes #1337
|
2017-11-08 03:16:51 +03:00 |
|
drcrazy
|
5f2ddec821
|
Un-oredicted frame for grinder recipe. Closes #1331
|
2017-11-08 02:05:07 +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 |
|
drcrazy
|
2ff9b6950d
|
Fixed type in zenclass name. Closes #1332
|
2017-11-05 23:49:11 +03:00 |
|
modmuss50
|
dedde645ad
|
#releaseBuild
|
2017-11-05 12:05:17 +00:00 |
|
modmuss50
|
d004ceef0e
|
Add lang names for new lights
|
2017-11-05 12:04:22 +00:00 |
|
drcrazy
|
19ccbd681d
|
Fixed itemBlock rendering. TOP\Waila are still an issue
|
2017-11-05 02:32:06 +03:00 |
|
Modmuss50
|
fadd249ed7
|
Merge pull request #1334 from ali1234/feature/lighting
Implement powered lighting.
|
2017-11-04 10:30:33 +00:00 |
|
Alistair Buxton
|
c6ac9110fe
|
Implement powered lighting.
|
2017-11-04 07:31:07 +00:00 |
|
Modmuss50
|
4d227e1401
|
Don't always push to github
|
2017-11-01 16:08:58 +00:00 |
|
Modmuss50
|
ec3ceab52d
|
Add support for github releases (Testing)
|
2017-11-01 16:03:44 +00:00 |
|
drcrazy
|
18fed6b237
|
Fixed #texture start up error
|
2017-10-30 23:18:03 +03:00 |
|
