Modmuss50
|
219f2a0df7
|
Quick Fix for MT Scripts
|
2015-11-17 18:19:12 +00:00 |
|
Modmuss50
|
96492bd87e
|
Fixes #275 again
|
2015-11-17 13:31:34 +00:00 |
|
Modmuss50
|
5e079afd05
|
Small fix to reactor MT support
|
2015-11-17 11:20:58 +00:00 |
|
Modmuss50
|
8c85aeb4d3
|
Added minetweaker support for Fusion Reactor
|
2015-11-17 08:24:41 +00:00 |
|
Modmuss50
|
7db2e0dc8c
|
Polish to the reactor
|
2015-11-16 21:50:09 +00:00 |
|
Modmuss50
|
b506c2e091
|
Added NEI support for fusion reactor
|
2015-11-16 21:24:10 +00:00 |
|
Modmuss50
|
a63128aa7e
|
Added Fusion Reactor
|
2015-11-16 21:10:39 +00:00 |
|
Modmuss50
|
1321422edf
|
Fixes #273
|
2015-11-16 19:01:27 +00:00 |
|
Modmuss50
|
78a7bcf4bc
|
Recoded MT support
|
2015-11-15 20:51:54 +00:00 |
|
Modmuss50
|
1551164cd6
|
Some work on recoding MT support
|
2015-11-13 13:18:48 +00:00 |
|
Modmuss50
|
bb2914bf5d
|
Fix imports
|
2015-11-13 08:28:32 +00:00 |
|
Modmuss50
|
de1d036b33
|
Revert "Fixes #219 Potentialy breaking for MT scripts."
This reverts commit f326dbfec9 .
|
2015-11-13 08:27:02 +00:00 |
|
Modmuss50
|
a7001bbfd7
|
Revert "fixes #219 again"
This reverts commit d562e1222a .
|
2015-11-13 08:26:51 +00:00 |
|
Modmuss50
|
7e07320844
|
Removed unused imports
|
2015-11-12 19:50:20 +00:00 |
|
Modmuss50
|
d562e1222a
|
fixes #219 again
|
2015-11-12 08:22:47 +00:00 |
|
Modmuss50
|
08b570ea36
|
Fixes #244
|
2015-11-11 17:08:41 +00:00 |
|
Modmuss50
|
8f45d418e3
|
Fixes crafting for lapotronicOrb
|
2015-11-11 16:50:28 +00:00 |
|
Modmuss50
|
2dd4e93f41
|
Cleaned up ore recipes, closes #241
|
2015-11-11 16:46:50 +00:00 |
|
Modmuss50
|
3799eb3eb2
|
Work for #182
|
2015-11-11 08:33:05 +00:00 |
|
Modmuss50
|
f326dbfec9
|
Fixes #219 Potentialy breaking for MT scripts.
|
2015-11-11 08:21:21 +00:00 |
|
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
|
678a44937f
|
Should fix #211
|
2015-11-07 08:58:26 +00:00 |
|
Modmuss50
|
9d9a1dba60
|
Fixes #231
|
2015-11-03 19:42:49 +00:00 |
|
MrBretzel
|
1307406e10
|
Adding iron alloy smelter to not enough items and fix ChargedHud possible crash
|
2015-11-01 23:10:32 +01:00 |
|
modmuss50
|
bffbd31cab
|
Sort of Revert "why was this done twice"
This reverts commit 363adeb681 .
Fixes #209
|
2015-11-01 16:24:35 +00:00 |
|
MrBretzel
|
b8487f5eb5
|
Fix #196 and mini clean up
|
2015-10-25 07:34:37 +01:00 |
|
modmuss50
|
50fa2e8a1d
|
Fixes #194
|
2015-10-22 18:19:05 +01:00 |
|
Modmuss50
|
7ae4ec1a98
|
Clean up of ic2 classic recipes
|
2015-10-14 13:39:05 +01:00 |
|
Modmuss50
|
652bea5bcd
|
More tweaks based off #189
|
2015-10-14 13:31:20 +01:00 |
|
Modmuss50
|
cae4aad955
|
fixes #189
|
2015-10-14 13:27:43 +01:00 |
|
gigabit101
|
935a8bc382
|
Removed more junk
|
2015-10-09 22:11:04 +01:00 |
|
gigabit101
|
a8ea0f55e7
|
Removed a load of un needed junk from other versions of Gtech
|
2015-10-09 21:55:54 +01:00 |
|
Modmuss50
|
cb6551c7ca
|
Fixed compile error with last commit
|
2015-10-07 11:17:09 +01:00 |
|
Modmuss50
|
6a404ba617
|
Fixes #166
|
2015-10-07 11:15:55 +01:00 |
|
Modmuss50
|
9c52e0ace7
|
Fixes #170 and fixes #167
|
2015-10-07 08:34:24 +01:00 |
|
Modmuss50
|
d490d00ab0
|
Removed forestry version checker, will try fix again later
|
2015-10-06 21:51:09 +01:00 |
|
Modmuss50
|
599ab5d634
|
Clean up forestry version checker
|
2015-10-06 20:47:50 +01:00 |
|
Modmuss50
|
4683f1450f
|
Disables forestry intergtation when not using version 4 or higher
|
2015-10-06 20:46:03 +01:00 |
|
Modmuss50
|
04a21f4dc7
|
Fixes #163
|
2015-10-05 11:18:44 +01:00 |
|
modmuss50
|
a390a37cb1
|
Fixes forestry saw mill recipes
|
2015-10-03 12:39:18 +01:00 |
|
modmuss50
|
3708a49bb9
|
Initial update to forestry 4(Sawmill recipes are not working)
|
2015-10-03 10:21:13 +01:00 |
|
modmuss50
|
146deb0e8b
|
Added recipes to IC2 classic, fixed recipes when using ic2, fixes #158
|
2015-10-02 21:01:30 +01:00 |
|
Modmuss50
|
a6792f37c6
|
Fixes #155 thanks @XuPuPG
|
2015-09-29 19:13:46 +01:00 |
|
Modmuss50
|
3f4b59faaf
|
Fixes #130
|
2015-09-23 17:27:41 +01:00 |
|
modmuss50
|
ccaabdd230
|
Started work on adding the recipes back to ic2 classic
|
2015-09-20 13:55:54 +01:00 |
|
Modmuss50
|
bd1540b27b
|
Fixed fluid power value importing
|
2015-09-14 21:34:56 +01:00 |
|
Modmuss50
|
0bf7e1968e
|
Fixed ic2 classic support on the master!
|
2015-09-14 21:05:26 +01:00 |
|
modmuss50
|
61a51b52a7
|
Fixes #83
|
2015-09-11 13:34:20 +01:00 |
|
modmuss50
|
8aafd118f5
|
Added fluid power manager, imports from forestry and bc
|
2015-09-08 18:39:59 +01:00 |
|
modmuss50
|
72799a9474
|
Added some fuels to forestry's api, might write our own and import bc's and forest into ours.
|
2015-09-08 13:26:24 +01:00 |
|
modmuss50
|
e02b1518d2
|
updates to the aesu gui
|
2015-09-05 21:09:37 +01:00 |
|
modmuss50
|
ebc685ba3d
|
Improvements to the compat manager.
|
2015-08-30 21:16:22 +01:00 |
|
modmuss50
|
15b9671dc4
|
fixes #120
|
2015-08-27 13:09:31 +01:00 |
|
modmuss50
|
d33c93005d
|
Added all of the machines to minetweaker. (untested)
|
2015-08-27 10:22:17 +01:00 |
|
modmuss50
|
c8e7e923ed
|
Added more minetweaker support
|
2015-08-27 09:04:41 +01:00 |
|
modmuss50
|
f9823b6ba6
|
Fixed minetweaker support for AlloyFurnace
|
2015-08-27 08:55:34 +01:00 |
|
gigabit101
|
25aeaf371e
|
added recipe for PDA
|
2015-08-16 21:19:27 +01:00 |
|
gigabit101
|
73f28281e3
|
A few more recipe tweeks and configs
|
2015-08-16 20:41:23 +01:00 |
|
modmuss50
|
ccb028a202
|
Tweaked thermal generator, closes #100
|
2015-08-16 12:17:02 +01:00 |
|
gigabit101
|
d17276e96d
|
Added config's to disable mod integration closes #111
|
2015-08-15 23:31:02 +01:00 |
|
modmuss50
|
e0ab0af822
|
Reformatted all the code using the default intelji formatting options.
|
2015-08-09 11:05:32 +01:00 |
|
modmuss50
|
9e346e6061
|
Added machine parts, added some recipes. Fixes #92
|
2015-08-05 15:35:06 +01:00 |
|
gigabit101
|
bac2cdcbc6
|
closes #55
|
2015-07-24 22:29:00 +01:00 |
|
modmuss50
|
8725c5932d
|
It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items.
|
2015-07-23 16:19:07 +01:00 |
|
modmuss50
|
fdc23c5ae9
|
Added support for EE3-Compataibilty
|
2015-07-06 20:33:50 +01:00 |
|
modmuss50
|
ab384b661a
|
Fixed lesu issue, temp remove rf output
|
2015-07-03 17:12:31 +01:00 |
|
modmuss50
|
0a82e61ebd
|
Some tweaks to minetweaker support
|
2015-07-03 08:40:38 +01:00 |
|
gigabit101
|
26eff9bcbf
|
Removed fluid tank from IndustrialElectrolyzer closes #58
|
2015-07-02 23:39:36 +01:00 |
|
modmuss50
|
a85d917873
|
Added minetweaker support to the alloy furnace.
I have no idea on how minetweaker works so could some one help me test?
for #70
|
2015-07-02 20:45:05 +01:00 |
|
modmuss50
|
85bfa95c1c
|
Some basic work for #70
|
2015-07-02 20:23:01 +01:00 |
|
modmuss50
|
4ae1293535
|
Optimised all imports
|
2015-07-02 19:51:24 +01:00 |
|
modmuss50
|
33898edf7c
|
Rewritten cable render, removed hard dep of QLIb :)
|
2015-07-02 19:49:30 +01:00 |
|
modmuss50
|
d795d81fba
|
added emc value for lesu
|
2015-07-02 17:39:04 +01:00 |
|
modmuss50
|
664252bc96
|
fixes #64
|
2015-06-29 19:18:26 +01:00 |
|
Gig
|
f2a67a60d4
|
Added localization to fluids closes #56
|
2015-06-29 15:53:54 +01:00 |
|
Gig
|
c2deb74a81
|
Fixed recipe button positions on all machines closes #57
|
2015-06-29 15:41:04 +01:00 |
|
Gig
|
15d3ad325f
|
bronze now has the correct emc value closes #59
|
2015-06-29 15:02:19 +01:00 |
|
modmuss50
|
2a95225c9c
|
Added rest of base values
|
2015-06-27 22:35:23 +01:00 |
|
modmuss50
|
8a3d173007
|
Added some new values
|
2015-06-27 22:04:52 +01:00 |
|
Gig
|
a5a8265c8b
|
Sawmill now renders fluids and so dose recipe handler
|
2015-06-27 16:07:11 +01:00 |
|
Gig
|
d1196d0a7c
|
Removed Recipes button and moved to progress bar
|
2015-06-27 10:01:39 +01:00 |
|
modmuss50
|
6f08a56df2
|
Added some values for copper and tin, added support for ic2 machines and crafting
|
2015-06-27 09:03:09 +01:00 |
|
Gig
|
6353b9dc06
|
Fixed some small recipe Issues
|
2015-06-27 01:29:20 +01:00 |
|
modmuss50
|
8aaebfeb63
|
Added some useful eel commands, and attempt at fix for reloading every restart.
|
2015-06-26 21:46:47 +01:00 |
|
modmuss50
|
40ca57331c
|
fixes #55
|
2015-06-26 21:28:16 +01:00 |
|
joflashstudios
|
9ae298eacc
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 13:07:46 -04:00 |
|
joflashstudios
|
1e4e42a202
|
Added thousands separator to make EU in NEI more readable
|
2015-06-26 13:07:25 -04:00 |
|
Gig
|
6e74b9197b
|
IndustrialElectrolyzer now uses fluids
IndustrialElectrolyzer now renders fluids in gui
IndustrialElectrolyzer recipe handler now renders fluids
|
2015-06-26 17:56:09 +01:00 |
|
modmuss50
|
66ce8d3a47
|
fixed #52
|
2015-06-26 08:21:20 +01:00 |
|
joflashstudios
|
b48dd6582a
|
Moved non-IC2 compat recipes out of IC2 compat class.
All that is in RecipesIC2 now are modifications to IC2 recipes, or additional recipes in IC2 machines.
|
2015-06-25 22:56:02 -04:00 |
|
joflashstudios
|
8814c1b9d2
|
Made GenericRecipeHandler more generic
|
2015-06-25 22:43:40 -04:00 |
|
joflashstudios
|
338575d56d
|
Added iron IBF recipes
|
2015-06-25 22:36:06 -04:00 |
|
joflashstudios
|
11d4345ee7
|
Renamed to ItemDustTiny for consistancy
Renamed to ItemDustsTiny
|
2015-06-25 20:04:08 -04:00 |
|
Gig
|
737d7e34a3
|
Scaled down the info in nei handlers
Scaled up the fluid renders for nei handlers
|
2015-06-26 00:44:40 +01:00 |
|
Gig
|
ddb4b5cb20
|
Moved blast furnace recipes over to new crafter still needs to get heat
|
2015-06-25 20:17:14 +01:00 |
|
Gig
|
6d99b28e7d
|
Fixed the IndustrialElectrolyzerRecipeHandler
|
2015-06-22 16:11:58 +01:00 |
|
joflashstudios
|
a7209f7e79
|
Added elecrolyzer NEI handler
|
2015-06-22 00:40:05 -04:00 |
|
joflashstudios
|
dc49bb9b45
|
Changed accessability, added placeholder electrolyzer recipe function
|
2015-06-21 20:00:25 -04:00 |
|
joflashstudios
|
2b17e7e949
|
Missed some AOBD lines
|
2015-06-14 18:03:32 -04:00 |
|