modmuss50
|
d96149fc97
|
Revert "Power system re-write, recipe fixes."
This reverts commit d982cc4028 .
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2016-08-10 00:51:44 +01:00 |
|
modmuss50
|
aa05d906f9
|
Revert "Wires now transfer energy from all mods and manages it as EU. (#686)"
This reverts commit 6f54e3801f .
# Conflicts:
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
|
2016-08-10 00:45:33 +01:00 |
|
modmuss50
|
cdae866b2d
|
Revert "Rewrite to use new RebornCore Power API. Texture fixes."
This reverts commit b292fdd352 .
# Conflicts:
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloySmelter.java
# src/main/java/techreborn/tiles/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
# src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/teir1/TileCompressor.java
# src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/teir1/TileExtractor.java
# src/main/java/techreborn/tiles/teir1/TileGrinder.java
# src/main/java/techreborn/tiles/teir1/TileRecycler.java
|
2016-08-10 00:45:07 +01:00 |
|
modmuss50
|
575773a6b3
|
Revert "RF wires fix."
This reverts commit fe64b8ccf7 .
|
2016-08-10 00:30:16 +01:00 |
|
modmuss50
|
8a0d981018
|
Revert "Fusion reactor fixes & rewrite, energy fixes."
This reverts commit 06fad2264f .
|
2016-08-10 00:30:08 +01:00 |
|
Dragon2488
|
06fad2264f
|
Fusion reactor fixes & rewrite, energy fixes.
|
2016-07-22 21:45:55 +07:00 |
|
Dragon2488
|
fe64b8ccf7
|
RF wires fix.
|
2016-07-22 01:46:43 +07:00 |
|
Dragon2488
|
b292fdd352
|
Rewrite to use new RebornCore Power API. Texture fixes.
|
2016-07-21 22:22:56 +07:00 |
|
Archengius
|
6f54e3801f
|
Wires now transfer energy from all mods and manages it as EU. (#686)
* Wires now transfer energy from all mods and manages it as EU. Multipart will fire in hell.
* Fix TechReborn to work with latest RebornCore
|
2016-07-21 07:51:55 -07:00 |
|
Dragon2488
|
d982cc4028
|
Power system re-write, recipe fixes.
Please note that this version breaks all wires placed in worlds before.
|
2016-07-18 11:57:52 +07:00 |
|
modmuss50
|
315c0aa509
|
Revert "Revert a shit load of stuff"
This reverts commit d25bb23e8e .
|
2016-07-01 15:55:37 +01:00 |
|
modmuss50
|
d25bb23e8e
|
Revert a shit load of stuff
|
2016-07-01 15:40:46 +01:00 |
|
modmuss50
|
96235d2c9d
|
Uses Reborncores version of MCMP
|
2016-06-01 12:06:51 +01:00 |
|
modmuss50
|
0f1e8eb6d7
|
Fixes cable issues, closes #596 thanks @xannor for spotting this
|
2016-05-22 20:48:03 +01:00 |
|
Prospector
|
8fffe67f17
|
Update to use new ChatUtils
|
2016-05-21 21:51:26 -07:00 |
|
modmuss50
|
74d500a2fd
|
Update to minecraft version 1.9.4
|
2016-05-18 16:53:54 +01:00 |
|
modmuss50
|
960bac8cc2
|
Fix Server Crash
|
2016-05-13 07:46:17 +01:00 |
|
modmuss50
|
6ef2285ab6
|
Fix Server Crash
|
2016-05-13 07:35:21 +01:00 |
|
modmuss50
|
560147e3b5
|
Fixed some issues with saving the parts, and broke the movement even more
|
2016-05-12 21:37:24 +01:00 |
|
modmuss50
|
9ecd52436b
|
Improve fluid propagation, still some issues
|
2016-05-12 18:41:51 +01:00 |
|
Prospector
|
2f370d5637
|
Fix localizations and improve chat messages
|
2016-05-11 18:44:28 -07:00 |
|
modmuss50
|
7808400028
|
Fix z-flighting and fluid movement, uv's still need a look at
|
2016-05-11 11:17:17 +01:00 |
|
modmuss50
|
37dc52d6df
|
Fluid moves, you just loose 1/2 of it
|
2016-05-10 21:45:54 +01:00 |
|
modmuss50
|
25280e9e7e
|
Small improvements to cable rendering
|
2016-05-10 13:10:27 +01:00 |
|
Prospector
|
1bcc459865
|
Make pipes look fancier
|
2016-05-09 17:38:41 -07:00 |
|
modmuss50
|
6488a9227e
|
Started work on fluid movement mechanic
|
2016-05-09 21:37:07 +01:00 |
|
modmuss50
|
62fd8f53f6
|
Added fluid pipe types
|
2016-05-09 17:27:22 +01:00 |
|
modmuss50
|
fd95cf7141
|
Some more work on fluid pipe rendering, I may recode it
|
2016-05-09 16:33:36 +01:00 |
|
modmuss50
|
dd6e69bea5
|
Start work on fluid pipes
|
2016-05-09 11:13:52 +01:00 |
|
modmuss50
|
caaa5a3e7f
|
Fix sounds
|
2016-05-08 11:42:59 +01:00 |
|
modmuss50
|
4095a0b52d
|
Auto update mappings
|
2016-05-06 22:13:24 +01:00 |
|
modmuss50
|
b822cee9fb
|
Update walia, add MT and CT support back, Fix #519, update for new RC bucket thing
|
2016-04-13 13:47:02 +01:00 |
|
modmuss50
|
510f969c94
|
Auto remove un needed things in the code
|
2016-04-03 14:34:39 +01:00 |
|
Prospector
|
b06c454634
|
Upgrade recipes
|
2016-03-29 02:17:48 -07:00 |
|
Prospector
|
d0f27cb941
|
Add more scrapbox loot (and dev heads to the loot! woo)
|
2016-03-28 02:24:15 -07:00 |
|
Prospector
|
e31cbae97a
|
No longer electrocutes players in creative mode
|
2016-03-28 01:27:34 -07:00 |
|
modmuss50
|
1ab2415e40
|
Fix crash, fix #414 and fix #411
|
2016-03-27 18:56:27 +01:00 |
|
modmuss50
|
aceceb7d2d
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 18:21:42 +01:00 |
|
Prospector
|
40a10cafd9
|
Localize cable tooltips
|
2016-03-27 11:14:59 -07:00 |
|
modmuss50
|
2801535bf8
|
Fixes #426
|
2016-03-27 18:21:31 +01:00 |
|
modmuss50
|
96464980c2
|
Fixed crash when not running with MCMP
|
2016-03-27 13:14:57 +01:00 |
|
Stuart Pomeroy
|
6498bd1974
|
Update to forge and fuck up the cables? Not sure :P
|
2016-03-26 15:58:38 +00:00 |
|
modmuss50
|
5eed5b161d
|
Code formatter take 2
|
2016-03-25 09:47:34 +00:00 |
|
modmuss50
|
33985f1a31
|
Revert "Added code formatter"
This reverts commit b9448d5d90 .
|
2016-03-24 00:41:47 +00:00 |
|
modmuss50
|
b9448d5d90
|
Added code formatter
|
2016-03-24 00:39:26 +00:00 |
|
modmuss50
|
244ade085d
|
Some small fixes
|
2016-03-23 20:00:00 +00:00 |
|
modmuss50
|
1c297634d7
|
Some fixes??
|
2016-03-21 20:37:08 +00:00 |
|
modmuss50
|
0c85662e14
|
derp, fix compile
|
2016-03-21 19:46:49 +00:00 |
|
modmuss50
|
aa64b1a8d6
|
Added more walia support, fix building
|
2016-03-21 19:45:48 +00:00 |
|
gigabit101
|
8f382f2239
|
stuff and things
|
2016-03-21 15:30:32 +00:00 |
|