Commit graph

3106 commits

Author SHA1 Message Date
modmuss50
71a5ec3e2a Add files back, blame git 2016-11-25 13:38:17 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +00:00
modmuss50
aceeb7a037 Fix resources 2016-11-25 13:24:01 +00:00
modmuss50
97b233dd44 Fix resources 2016-11-25 13:23:42 +00:00
FliegendeWurst
df74ca5176 Fix small formatting and spelling errors in readme () 2016-11-24 19:42:22 +00:00
modmuss50
655c5979a0
Add lowercase resources back 2016-11-19 16:37:12 +00:00
modmuss50
fd07083129
Removed upppercase 2016-11-19 16:36:42 +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
c8d8ce0241 yeah, that doesnt work 2016-11-15 17:00:16 +00:00
Modmuss50
22b8f5bcde Testing https for curse badge 2016-11-15 16:57:56 +00:00
modmuss50
59bd497893
Fix issue with ore generation in some cases 2016-11-07 22:39:53 +00:00
modmuss50
e0118c4cf3
Version 1.4.10
Disabled flares they can come later
2016-11-06 20:26:58 +00:00
brad18
f5172ee496
Update ModRecipes.java ()
Brings Cupronickel heating coil recipe into line with Gregtech MC 1.4.7 and fixes 
2016-11-06 20:14:29 +00:00
modmuss50
d9d8845d6d
Added flare, still needs some textures 2016-11-06 19:14:43 +00:00
modmuss50
d75120bb00
Give more fluids power values 2016-11-05 17:55:50 +00:00
modmuss50
9ffdc3e36e
Fix world gen issues, you may need to delete ores.hjson 2016-11-05 17:54:00 +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 2016-11-05 17:22:24 +00:00
modmuss50
51331b77e7
Adjust MFE and MFSU values, closes 2016-11-05 17:09:57 +00:00
modmuss50
9767173152
Update .gitignore 2016-11-05 16:54:51 +00:00
modmuss50
0dd3b725ce
Fix recipe crash 2016-11-05 16:53:22 +00:00
modmuss50
dda189fbc6
Add Electric Treetap & Make sap go directly into inventory : From: 2aa69a1425eb8928d530c58e7c8a2495e71ea78f 2016-11-05 16:33:27 +00:00
modmuss50
9e47eb8cfe
Auto set formatter for idea 2016-11-05 16:30:22 +00:00
modmuss50
f669e8b47b
Manually apply: 4fe5b68aaa100eeca675a596fcad9329403ecab8 2016-11-05 16:29:37 +00:00
ProfessorProspector
145124e3dd
Nanosaber now deactivates if it's out of power, and won't activate if there's not enough power.
# Conflicts:
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-11-05 16:28:18 +00:00
ProfessorProspector
2de0ba95a6
Add ruby ore dropping garnets based on ore dict, not the ore itself. Closes
# Conflicts:
#	src/main/java/techreborn/Core.java
2016-11-05 16:27:17 +00:00
ProfessorProspector
31a901cf89
fix another gem thing 2016-11-05 16:25:47 +00:00
ProfessorProspector
3073a19cfa
Fix gem tools and armour recipes 2016-11-05 16:25:32 +00:00
modmuss50
c9ff3330ca
Fix , fix some issues with ic2 wrench, and use new forge perms to check when taping and wrenching blocks 2016-11-05 15:10:28 +00:00
modmuss50
015620094c
1.4.9 2016-11-05 10:47:48 +00:00
modmuss50
916913337b
Fix 2016-11-05 10:43:00 +00:00
modmuss50
9af69638e2
Fix 2016-11-05 10:39:13 +00:00
modmuss50
73095ca198
Fix startup crash when adding some recipes. 2016-11-04 20:10:19 +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
19f1e71ac4
Fix
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:07:41 +00:00
3Pixel
3b9e48a345
Fixed the blast Furnace recipe ()
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:05:41 +00:00
modmuss50
96d20b7147
No longer regen ores.hjson should fix 2016-11-04 20:04:44 +00:00
modmuss50
cff4878eb0
Fix rubber sapling finding top most block of world to grow from. Fixes 2016-11-04 20:04:27 +00:00
modmuss50
603c12590d
Update to support RC 2.8 2016-11-04 20:03:05 +00:00
3Pixel
e19f1c6ca9 Fixed the blast Furnace recipe ()
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
2016-10-18 00:14:18 +01:00
Modmuss50
0ece0aff33 Version Bump 2016-10-09 14:02:09 +01:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes 2016-10-08 21:56:24 +01:00
modmuss50
ee9f48bc84
Fix 2016-10-08 20:47:22 +01: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
112b1657cf Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2 2016-09-27 19:34:28 +01:00
modmuss50
38f965917f Fix Start-up crash + new version 2016-09-27 19:34:18 +01:00
Modmuss50
7e4b2fd40d Update README.md 2016-09-27 19:24:33 +01:00