modmuss50
|
5782d2d032
|
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
# src/main/java/techreborn/client/container/ContainerAlloySmelter.java
# src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
# src/main/java/techreborn/client/container/ContainerCentrifuge.java
# src/main/java/techreborn/items/tools/ItemNanosaber.java
|
2016-12-05 10:57:55 +00:00 |
|
modmuss50
|
2fdce5405b
|
Improve block names
|
2016-12-05 09:40:55 +00:00 |
|
brad18
|
a5f306eb69
|
Fixes Compressor inputting items into output slot (#812)
|
2016-11-27 22:21:09 +00:00 |
|
modmuss50
|
b1b8537159
|
Fix log spam with some machines, closes #809 #releasebuild
|
2016-11-26 21:14:57 +00:00 |
|
modmuss50
|
e16c3eba02
|
Auto format
|
2016-11-25 13:25:51 +00:00 |
|
modmuss50
|
528fecc2b5
|
Fix a load of null issues, and get it to sort of work.
|
2016-11-19 16:36:13 +00:00 |
|
modmuss50
|
65e651f402
|
It compiles, disable JEI as it needs redoing
|
2016-11-19 14:41:00 +00:00 |
|
modmuss50
|
a0e6a2dc34
|
Start on the update
|
2016-11-19 12:50:08 +00:00 |
|
modmuss50
|
d9d8845d6d
|
Added flare, still needs some textures
|
2016-11-06 19:14:43 +00:00 |
|
modmuss50
|
b60941ddd4
|
Fix grinder using twice is recommended power
|
2016-11-05 17:36:48 +00:00 |
|
modmuss50
|
29b0d2443f
|
Large buff to power usage, should fix #769
|
2016-11-05 17:22:24 +00:00 |
|
modmuss50
|
51331b77e7
|
Adjust MFE and MFSU values, closes #777
|
2016-11-05 17:09:57 +00:00 |
|
modmuss50
|
916913337b
|
Fix #789
|
2016-11-05 10:43:00 +00:00 |
|
modmuss50
|
603c12590d
|
Update to support RC 2.8
|
2016-11-04 20:03:05 +00:00 |
|
modmuss50
|
796df6c055
|
Auto Format code
|
2016-10-08 20:46:16 +01:00 |
|
modmuss50
|
aefe9f6a36
|
Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2
|
2016-09-06 22:16:29 +01:00 |
|
modmuss50
|
d5ff2a42bb
|
Fixes #723 and wrench works with ic2 machines now
|
2016-09-06 22:16:21 +01:00 |
|
Utoc
|
2ae38dea9e
|
Slot index changes (#734)
Changes slot index values to allow machines to be pulled from.
|
2016-08-27 08:02:44 +01:00 |
|
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
|
8a0d981018
|
Revert "Fusion reactor fixes & rewrite, energy fixes."
This reverts commit 06fad2264f .
|
2016-08-10 00:30:08 +01:00 |
|
modmuss50
|
22fd152ec9
|
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
This reverts commit be4f10b975 .
# Conflicts:
# src/main/java/techreborn/init/ModBlocks.java
|
2016-08-10 00:29:47 +01:00 |
|
Dragon2488
|
a5a9460707
|
Automation fixes, upgrades fixes.
|
2016-07-27 17:51:03 +07:00 |
|
Dragon2488
|
be4f10b975
|
Energy storages item charging fixes, transformers fixes, electric items fixes.
|
2016-07-25 15:10:55 +07:00 |
|
Dragon2488
|
b42b5274b5
|
Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix.
|
2016-07-25 02:26:15 +07:00 |
|
Dragon2488
|
0011553cf7
|
Sawmill changes & fixes.
|
2016-07-24 01:10:37 +07:00 |
|
Dragon2488
|
06fad2264f
|
Fusion reactor fixes & rewrite, energy fixes.
|
2016-07-22 21:45:55 +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 |
|
modmuss50
|
10aa2f2ffb
|
fix merge
|
2016-07-19 11:46:53 -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 |
|
al132
|
166f9a924f
|
Fixed Output of extractor (#679)
* Add CraftTweaker support for the Compressor
* Fix Extractor insertion and extraction
* Oops
|
2016-07-18 02:06:47 +01:00 |
|
Dragon2488
|
33df1d3319
|
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. (#673)
|
2016-07-16 10:44:54 +01: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
|
d80280b110
|
Fix random world gen crash - Fix electric furnace and version bump
|
2016-06-04 17:03:22 +01:00 |
|
modmuss50
|
246113dfca
|
Fix generator being overpowered
|
2016-06-04 14:28:36 +01:00 |
|
Modmuss50
|
ae2e063440
|
Update TileBatBox.java
|
2016-06-04 14:22:48 +01:00 |
|
modmuss50
|
1fd58d8986
|
Improve matter fab
|
2016-05-28 19:33:17 +01:00 |
|
modmuss50
|
9fa5e560e1
|
Fixes #561
|
2016-05-23 17:09:38 +01:00 |
|
modmuss50
|
78ccf1bcfb
|
Tweak some power values, closes #564
|
2016-05-23 17:05:10 +01:00 |
|
modmuss50
|
128a95c338
|
jei 1.9.4 and clean tile packets
|
2016-05-19 09:07:31 +01: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
|
b0fbd5aea0
|
Update to support removal of ic2 api
|
2016-05-12 19:16:40 +01:00 |
|
modmuss50
|
a78b2b6745
|
Bump the windmill eu output
|
2016-05-09 21:24:37 +01:00 |
|
modmuss50
|
4cd4e4109b
|
Speed improvement
|
2016-05-09 18:33:01 +01:00 |
|
modmuss50
|
45e31c1aef
|
Added pump
|
2016-05-08 21:42:09 +01:00 |
|
modmuss50
|
c9f84375ac
|
Fixes #549 gui still needs syncing
|
2016-05-08 10:00:06 +01:00 |
|