Commit graph

70 commits

Author SHA1 Message Date
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
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
796df6c055
Auto Format code 2016-10-08 20:46:16 +01:00
Dragon2488
c8301e4db3 Veins ore generation system. WIP. 2016-08-01 01:12:55 +07:00
modmuss50
315c0aa509 Revert "Revert a shit load of stuff"
This reverts commit d25bb23e8e.
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e Revert a shit load of stuff 2016-07-01 15:40:46 +01:00
modmuss50
dbaed2721e Fixes #590 and fixes build 2016-05-21 20:05:13 +01:00
modmuss50
0ac27fd90e Fixes #585 2016-05-17 10:35:00 +01:00
modmuss50
4c5cf82db4 Rewrite ores 2016-05-16 15:48:48 +01:00
modmuss50
2df4688887 Fixes #578 2016-05-16 14:30:32 +01:00
modmuss50
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
Prospector
994d12a850 Remove lots of useless stuff (will break existing worlds) 2016-04-29 21:21:28 -07: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
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
5460f2f9a2 Fixed crashes 2016-03-20 12:10:23 +00:00
modmuss50
8c24711d4f Optimise imports 2016-03-15 08:13:05 +00:00
modmuss50
32f25a0141 Its gets to main menu 2016-03-13 18:38:41 +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
28dda59ed5 Rewritten world generation, new ores.json config file 2016-03-11 20:24:05 +00:00
gigabit101
6549282ea0 Cleaned up imports 2016-02-26 13:03:30 +00:00
modmuss50
9a585bcfb2 Merge branch '1.7.10' into 1.8.9
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/BlockOre.java
	src/main/java/techreborn/items/ItemCells.java
2016-02-16 13:49:25 +00:00
The-Fireplace
efccf62690 Update BlockOre.java
Conflicts:
	src/main/java/techreborn/blocks/BlockOre.java
2016-02-16 09:08:07 +00:00
The-Fireplace
0d35ecb70f Update BlockOre.java 2016-02-06 14:18:47 -06:00
modmuss50
c2562ac7b3 Update JSONDestroyer 2016-02-01 15:06:14 +00:00
modmuss50
7e7ad74203 Squashed commit of the following:
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:38:27 2016 +0000

    Rename to fix spelling issue

commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:27:15 2016 +0000

    Update to new JSON-Destoryer version

commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date:   Wed Jan 20 17:27:41 2016 +0000

    Update to new json destroyer
2016-01-22 13:39:20 +00:00
modmuss50
2b54516bdd Fixes #321 - And I tested it so I know it works 2016-01-09 11:41:16 +00:00
modmuss50
b242ec5c5f Cut all the things! 2016-01-02 01:40:11 +00:00
modmuss50
7e12e3acbf Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-01-01 20:36:12 +00:00
modmuss50
cf800a905b Fixes #309 and might help #314 2016-01-01 20:35:58 +00:00
modmuss50
c791bcdeb5 update to new RebornCore 2015-12-30 23:25:36 +00:00
Modmuss50
9bb3aad137 Update to new RebornCore 2015-12-11 19:48:16 +00:00
modmuss50
20af49394f Fluid rendering, no more wasted block states 2015-12-05 19:37:42 +00:00
Modmuss50
b0784c44d2 Fixes for latest forge and more rendering. 2015-11-26 17:35:31 +00:00
Modmuss50
d56e6752c0 A lot of stuff looks better now 2015-11-24 22:58:18 +00:00
Modmuss50
839647ed85 734 2015-11-23 19:51:40 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
011ebaba1d 4862 2015-11-23 14:45:16 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
be33bdc148 Fixes #80 2015-07-12 16:51:14 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
Gig
7ba9cad072 increase ores hardness 2015-06-24 14:12:30 +01:00
joflashstudios
54904b223f Fixed oredrops
Fixes #36
2015-06-17 00:27:44 -04:00
modmuss50
a94085229d Moved OreDrop
With a small bit of work we could make an api to get the config values,
then this could go in the api
2015-06-08 17:44:29 +01:00