Commit graph

55 commits

Author SHA1 Message Date
ProfessorProspector
ee9e46eaa3 Clean up mcmod.info and add space to mod name 2017-04-19 19:37:07 -07:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing 2016-11-19 14:41:00 +00:00
modmuss50
271a8f2b2b
Fix ingot->dust dupe bug
Fix RC version not working in dev
2016-11-04 20:09:35 +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
way2muchnoise
fb6feac92f update to JEI 3.11 (#757) 2016-09-27 17:03:57 +01:00
modmuss50
973f68496c Merge branch '1.9.4' into 1.9.4-ic2
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:02:19 +01:00
Prospector
4c01fa8864 Started work on fixing nanosaber 2016-06-05 03:57:38 -07:00
modmuss50
87f6ea1eb0 Ic2 recipes? 2016-06-04 20:07:34 +01:00
Prospector
8fffe67f17 Update to use new ChatUtils 2016-05-21 21:51:26 -07:00
modmuss50
68b77fca0a Version 1.1.1 2016-05-16 16:09:28 +01:00
modmuss50
510f969c94 Auto remove un needed things in the code 2016-04-03 14:34:39 +01:00
modmuss50
df61729d6f Some work on the new api 2016-04-03 14:07:45 +01:00
Prospector
28fd887ee3 Ruby, sapphire, and peridot armour 2016-03-27 22:48:31 -07:00
Prospector
a636da1882 Bronze Tools and Armour 2016-03-27 21:20:27 -07: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
b4a16c03ed And 50 more errors fixed 2016-03-13 16:15:27 +00:00
TheDoctorSoda
c5302f8d6b Add description page to JEI on how to obtain sap 2016-03-07 23:15:53 -08:00
gigabit101
080b633493 Finish up on recycler and temp jei handler 2016-03-07 14:07:52 +00:00
gigabit101
047625389d Added compressor, extractor, electric furnace 2016-02-20 03:07:56 +00:00
gigabit101
8ad4a45716 Added basic Grinder 2016-02-20 00:57:57 +00:00
mezz
a00543c67d Update to latest JEI 2016-01-06 00:46:23 -08:00
Modmuss50
efd19336bf Revert "Load TechReborn before RebornCore might help with #299"
This reverts commit a1194698cb.
2015-12-14 08:31:39 +00:00
Modmuss50
a1194698cb Load TechReborn before RebornCore might help with #299 2015-12-14 08:24:13 +00:00
Modmuss50
d5ce5cba04 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
#	src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
2015-12-12 11:41:21 +00:00
Modmuss50
cc6dfbc3c4 Fixes #295 2015-12-11 21:52:35 +00:00
modmuss50
801964a92d Bumped required forge version 2015-12-06 15:02:05 +00:00
Modmuss50
3114576e7b Most of the Vacuum Freezer(Not working just yet) 2015-11-17 21:48:06 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
47a466ef21 Some fixes for #242 2015-11-11 15:24:13 +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
65d20ec431 Fixes #221 and hides the multiblock when the world is closed. 2015-11-02 15:15:22 +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
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
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
gigabit101
bac2cdcbc6 closes #55 2015-07-24 22:29:00 +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
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
Gig
c11086243b Missing Multiblock message can now be localized 2015-06-26 01:28:18 +01:00
modmuss50
10eb1eda45 Clean fix for #42 2015-06-23 19:39:39 +01:00
Gig
98c8f43b84 Added keybinding to toggle if hud is shown 2015-06-14 20:53:05 +01:00
modmuss50
51c91aaccb Added lesu storage block counting 2015-06-14 13:35:36 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Gig
4b7b9d4fd2 Removed unused lib 2015-04-23 19:11:30 +01:00
Modmuss50
49d0e480e1 Removed modmussCore 2015-04-20 21:30:24 +01:00