modmuss50
|
ef03cf50a9
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
src/main/java/techreborn/asm/LoadingPlugin.java
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
src/main/java/techreborn/client/render/MultiblockRenderEvent.java
src/main/java/techreborn/compat/recipes/RecipesIC2.java
src/main/java/techreborn/init/ModItems.java
src/main/java/techreborn/lib/Location.java
src/main/java/techreborn/packets/PacketPipeline.java
src/main/java/techreborn/partSystem/fmp/CableConverter.java
|
2015-11-08 12:34:18 +00:00 |
|
modmuss50
|
8abf6e5282
|
Moved to RebornCore
|
2015-11-08 12:15:45 +00:00 |
|
modmuss50
|
50a830a101
|
Fixes #207
|
2015-11-01 16:45:58 +00:00 |
|
modmuss50
|
2483dc0c2f
|
Work for #212
|
2015-11-01 14:43:06 +00:00 |
|
modmuss50
|
1342eb90cf
|
Fixes #216
|
2015-11-01 14:36:44 +00:00 |
|
modmuss50
|
8e6de190c0
|
Fixes #208
|
2015-10-28 18:50:28 +00:00 |
|
modmuss50
|
dabe79a877
|
Removed ChatColor and replaced with ChatFormatting
|
2015-10-25 18:55:49 +00:00 |
|
modmuss50
|
cf34fe1f1f
|
Large improvement to power system, fixes #204
|
2015-10-25 09:58:57 +00:00 |
|
modmuss50
|
50fa2e8a1d
|
Fixes #194
|
2015-10-22 18:19:05 +01:00 |
|
Modmuss50
|
2d3c6a8dec
|
Charge bench now uses new power system, also uses old one
|
2015-10-14 21:42:45 +01:00 |
|
Modmuss50
|
9d824e76ca
|
Most of the stuff uses the new item power net now
|
2015-10-14 21:37:21 +01:00 |
|
Modmuss50
|
2d06d726b4
|
Started work on rewriting the item power API
|
2015-10-14 20:57:44 +01:00 |
|
Modmuss50
|
75e2bd4733
|
Machines now explode when they come in contact with rain.
|
2015-10-07 15:41:26 +01:00 |
|
Modmuss50
|
cf49f01042
|
Added better support for ic2 classic power system
|
2015-09-14 21:07:44 +01:00 |
|
modmuss50
|
8aafd118f5
|
Added fluid power manager, imports from forestry and bc
|
2015-09-08 18:39:59 +01:00 |
|
modmuss50
|
11e680500f
|
Fixed crash when RF is disabled
|
2015-08-16 11:50:25 +01:00 |
|
modmuss50
|
44c5037b28
|
Added config settings for power net, closes #112
|
2015-08-15 17:03:28 +01:00 |
|
modmuss50
|
e0ab0af822
|
Reformatted all the code using the default intelji formatting options.
|
2015-08-09 11:05:32 +01:00 |
|
modmuss50
|
a6431776a8
|
Fixed power disappearing
|
2015-08-05 19:32:01 +01:00 |
|
modmuss50
|
4404122002
|
Fixes #93, use energy was inverted, canUseEnergy was always returning true
|
2015-08-05 18:21:56 +01:00 |
|
modmuss50
|
5927eaca4c
|
Recoded idsu, closes #81
|
2015-07-26 16:01:27 +01:00 |
|
modmuss50
|
f433aa706a
|
Fixed crashing when ic2 is not installed
|
2015-07-26 15:35:02 +01:00 |
|
modmuss50
|
d8e8f45993
|
Fixed incorrect rf calculation values
|
2015-07-26 14:46:56 +01:00 |
|
modmuss50
|
e8bbbcc7c3
|
Some changes to the way rf is handled.
|
2015-07-25 17:55:03 +01:00 |
|
modmuss50
|
26f63e04f7
|
some small changes
|
2015-07-25 17:11:03 +01:00 |
|
modmuss50
|
aff8c26c49
|
Fixes energy gui scaling
|
2015-07-25 15:16:22 +01:00 |
|
modmuss50
|
496151fcae
|
Fixed aesu powers in creative tab, more work moving away from ic2 core and only needing ic2 api
|
2015-07-23 13:42:20 +01:00 |
|
modmuss50
|
277e5e5e45
|
Fix incorrect EU-RF conversion
|
2015-07-23 13:07:20 +01:00 |
|
modmuss50
|
e9ece63a99
|
Initial untested port to new internal power system.
This resets all the machines internal power buffer
|
2015-07-23 12:52:51 +01:00 |
|
modmuss50
|
984b502ded
|
fixes #85 , Fixes issues with RF output
|
2015-07-23 10:13:37 +01:00 |
|
modmuss50
|
ab384b661a
|
Fixed lesu issue, temp remove rf output
|
2015-07-03 17:12:31 +01:00 |
|
modmuss50
|
b7a9824cd3
|
Added config setting for eu/rf value
|
2015-07-02 23:35:10 +01:00 |
|
modmuss50
|
a5505ccd0c
|
Fixed RF not outputting
|
2015-07-02 13:16:47 +01:00 |
|
modmuss50
|
a71b399765
|
Moved the lesu to the new system, looks like its stripping every thing ;'(
|
2015-07-01 20:34:22 +01:00 |
|
modmuss50
|
30ff429b6a
|
Moved our energy net to doubles, should be all done(now need to test), added eu to rf conversion
|
2015-07-01 17:53:03 +01:00 |
|
modmuss50
|
78faca7a19
|
Implemented the other apis, now need to implement our own
|
2015-07-01 17:23:29 +01:00 |
|
modmuss50
|
5b06a20351
|
Added ASM Method and Field stripper, more work on own power net
|
2015-07-01 16:41:40 +01:00 |
|
modmuss50
|
4fae706242
|
Started work on new power api
|
2015-07-01 12:56:45 +01:00 |
|