Commit graph

52 commits

Author SHA1 Message Date
modmuss50
e5e05d0afd Chainsaw chops down the entire tree 2017-10-03 17:39:33 +01:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +03:00
modmuss50
2f221ed8c8
Fix #992 2017-07-10 18:49:04 +01:00
modmuss50
774fec221e
Auto format code 2017-06-28 20:54:12 +01:00
modmuss50
ba644982fe
Update to support new forge registry system 2017-06-24 20:15:49 +01:00
modmuss50
a701094d1d
Update all license headers 2017-06-15 12:28:26 +01:00
modmuss50
aa615f86bd
Recipes are now added to the recipe book when a tree tap is used. 2017-06-15 11:35:08 +01:00
modmuss50
5536a6cd94
Recipes can now show in the recipe book 2017-06-15 11:01:33 +01:00
modmuss50
b7e141e004
More config changes 2017-06-12 20:33:30 +01:00
Prospector
2b7868c651 More configs & start fixing cable models 2017-06-08 19:12:58 -07:00
modmuss50
aee7ca9f14
Rewrite cable logic to use FE.
Fixes #1077 Fixes #1071 Fixes #1067 Fixes #1070 Fixes #1059 Fixes #1044 Fixes #1041 Fixes #1025 Fixes #1006 Fixes #990 Fixes #987 Fixes #962 Fixes #955 Fixes #897
2017-05-18 16:01:18 +01:00
modmuss50
056eff09b2
Some more improvements to the power net. 2017-03-16 13:22:17 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
b8949ee8fa
Add power net to profiling data. 2017-01-09 12:55:08 +00:00
Prospector
6a70424252 Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class. 2016-12-31 23:29:32 -08:00
ProfessorProspector
3162422ee2 remove more debug code 2016-12-21 17:12:24 -08:00
ProfessorProspector
2ecf8400b8 Fix red garnet drops 2016-12-21 17:03:34 -08:00
Prospector
811d9edf54 Fix #836 2016-12-14 11:25:50 -08:00
ProfessorProspector
86b98cab13 Unify tooltip messages, fix cable subtypes, and fix ruby drops 2016-12-10 18:13:27 -08:00
modmuss50
5dff31d937 A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +00:00
modmuss50
a0e6a2dc34
Start on the update 2016-11-19 12:50:08 +00:00
ProfessorProspector
2de0ba95a6
Add ruby ore dropping garnets based on ore dict, not the ore itself. Closes #595
# Conflicts:
#	src/main/java/techreborn/Core.java
2016-11-05 16:27:17 +00:00
modmuss50
871edce960
Fix some CME's in the powernet, and add a basic profiler to it, might add a command or someway to use this without enabling it in the code 2016-10-08 20:47:04 +01:00
modmuss50
796df6c055
Auto Format code 2016-10-08 20:46:16 +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
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
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
modmuss50
510f969c94 Auto remove un needed things in the code 2016-04-03 14:34:39 +01:00
Stuart Pomeroy
2209177e1a Fix config changes etc. 2016-03-28 20:51:23 +01: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
8c24711d4f Optimise imports 2016-03-15 08:13:05 +00:00
modmuss50
cc0b762b56 87 errors, will finish later 2016-03-13 17:38:12 +00:00
modmuss50
9a40abbe78 Now comes the grind, 244 errors left 2016-03-13 16:08:30 +00:00
modmuss50
7f920b282f Optimise imports to make it easier to find and replace package names 2016-03-13 15:37:55 +00:00
modmuss50
6765756e2d Some more fixes to the energy net 2016-03-08 18:55:40 +00:00
modmuss50
f966cdb632 Power net is working (just) 2016-03-07 21:45:06 +00:00
modmuss50
10c593e3c1 Initial work on new power network 2016-03-07 19:05:56 +00:00
gigabit101
6549282ea0 Cleaned up imports 2016-02-26 13:03:30 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
85e7bfacde Added ore unifier, disbled by defualt. 2015-11-11 17:25:55 +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
a8c9b71e47 Some work on the ore Unifier, for #225 2015-11-07 09:12:44 +00:00
modmuss50
8c421d20dd Some small tweaks to the cloaking device 2015-08-14 00:28:28 +01:00
modmuss50
65f0bb2175 Fixed last PR 2015-08-14 00:09:44 +01:00
primetoxinz
87877c647a remove random import 2015-08-13 19:06:11 -04:00