modmuss50
|
dc4cdbb9cc
|
Fixes #1368
|
2017-12-17 21:53:14 +00:00 |
|
modmuss50
|
ee075feea9
|
Fixes #1359
|
2017-12-17 21:43:12 +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
|
dce7e43c4f
|
Fixed amount for empty cells. Closes #1366
|
2017-12-16 01:46:34 +03:00 |
|
drcrazy
|
6c7f9078ec
|
Secondary gem moved to eventHandler. Closes #1365
|
2017-12-15 16:43:48 +03: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 |
|
drcrazy
|
17f819e9c6
|
Added charcoal dust grinder recipe.
|
2017-12-08 20:25:25 +03:00 |
|
drcrazy
|
a419189926
|
Added dust->ingot<->block recipes for several materials. Closes #1356
|
2017-12-08 16:43:04 +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 |
|
冷风
|
e8d6009e83
|
Update zh_cn.lang
|
2017-12-02 08:26:48 +08: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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
Alistair Buxton
|
c6ac9110fe
|
Implement powered lighting.
|
2017-11-04 07:31:07 +00:00 |
|
drcrazy
|
18fed6b237
|
Fixed #texture start up error
|
2017-10-30 23:18:03 +03:00 |
|
drcrazy
|
047507f4fc
|
Fixed error message about #texture
|
2017-10-29 02:44:04 +03:00 |
|
modmuss50
|
2f52171a04
|
Still didnt fix it ;(
|
2017-10-27 09:40:12 +03: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
|
63def52526
|
Hybrid texture top fix
|
2017-10-27 09:34:59 +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
|
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
|
9855cce93d
|
Upgrade merge
|
2017-10-27 09:34:53 +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 |
|
drcrazy
|
c8b6edd390
|
Updated LESU. Closes #1322
|
2017-10-26 02:26:07 +03:00 |
|
drcrazy
|
bae5f73d85
|
Refactored smelting recipes init.
|
2017-10-24 18:14:01 +03:00 |
|
drcrazy
|
440c089b5f
|
Fixed scrapbox list of outputs. Closes #1317. I hope )
|
2017-10-24 15:09:53 +03:00 |
|
drcrazy
|
57151a6f67
|
Brought back upgrades recipes in IC2 dedup mode. Closes #1302
|
2017-10-24 12:21:10 +03:00 |
|
drcrazy
|
5974ae094d
|
Added icons for armor slots in MFE\MFSU\etc.
|
2017-10-23 18:18:25 +03:00 |
|
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 |
|