Commit graph

2397 commits

Author SHA1 Message Date
modmuss50
5dff31d937 A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
modmuss50
97e5fcc032 Fix #825 2016-12-06 08:23:11 +00:00
modmuss50
bf60b32eb2 Version 2.0.0 #betaBuild 2016-12-05 13:13:42 +00:00
modmuss50
a42cf2990f Fix recipes, without silicon 2016-12-05 13:04:21 +00:00
modmuss50
f07bae19bd Fix iridium stone, remove silicon ingot. 2016-12-05 13:00:54 +00:00
modmuss50
c04a98061a Hide Missing recipe item in JEI 2016-12-05 12:50:55 +00:00
modmuss50
8581848a16 Fix lesu storage 2016-12-05 12:48:38 +00:00
modmuss50
430a3313c4 Fix Reinforced Glass 2016-12-05 12:39:16 +00:00
modmuss50
463740ac99 Rename method to reflect the 1.11 changes. 2016-12-05 11:19:37 +00:00
modmuss50
d53f4dafc1 Added extra validation to recipe inputs and outputs, fixed one bug because of it. 2016-12-05 11:18:30 +00:00
modmuss50
b1e00e6ce7 Update build.conf 2016-12-05 10:59:43 +00:00
modmuss50
75dbf2daff Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-05 10:59:22 +00:00
modmuss50
5782d2d032 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloySmelter.java
#	src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
#	src/main/java/techreborn/client/container/ContainerCentrifuge.java
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-12-05 10:57:55 +00:00
modmuss50
e6c58a04b7 Fix Lapotronic Orb 2016-12-05 10:54:46 +00:00
modmuss50
72f85d5243 Auto format code. 2016-12-05 10:48:21 +00:00
modmuss50
a96c094267 Removed un used block. 2016-12-05 10:21:17 +00:00
modmuss50
8379115c97 Fix Machine Casings 2016-12-05 10:17:39 +00:00
modmuss50
c661f6b278 Fix Machine Casing Model 2016-12-05 10:07:41 +00:00
modmuss50
2fdce5405b Improve block names 2016-12-05 09:40:55 +00:00
modmuss50
40835a2773 Update forge version 2016-12-05 09:19:16 +00:00
Prospector
f1ce404849 Delete Tesla-1.9.4-1.1.0.24-deobf.jar 2016-11-29 06:20:24 -08:00
brad18
02011b247a Fixes to the Centrifuge Block (#815)
* Fixes Compressor inputting items into output slot

* Changes to Centrifuge block

Add inventory import/export via conduits etc.
Added support for overclockers.
Only allow empty cans into the correct slot and put all other items into slot 0 (ingredient slot).

Credit to Ellpeck for helping with this one.
2016-11-28 21:32:13 +00:00
modmuss50
c72c3b5851 Update JEI support, in a few places I could not figure it out, so there may be some issues. 2016-11-28 15:28:32 +00:00
modmuss50
9c33676b3d Fix nuke texture 2016-11-28 13:05:11 +00:00
modmuss50
1dbc56f739 Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup). 2016-11-28 13:01:30 +00:00
modmuss50
cf9f2def43 Rename folder so git keeps correct caps 2016-11-28 12:55:06 +00:00
modmuss50
83ef3e7577 Start of new texturesm, again 2016-11-28 12:54:44 +00:00
modmuss50
360d9c2756 Fix language files not being applied. 2016-11-28 11:01:33 +00:00
Modmuss50
53dd546e6f Update README.md 2016-11-27 22:24:07 +00:00
brad18
a5f306eb69 Fixes Compressor inputting items into output slot (#812) 2016-11-27 22:21:09 +00:00
modmuss50
0547999e0d
Bump version #releasebuild 2016-11-27 18:38:03 +00:00
modmuss50
54eee49e5d
Fix #810 2016-11-27 18:31:50 +00:00
ProfessorProspector
c53ab29cf1 Update TESLA 2016-11-26 17:15:59 -08:00
ProfessorProspector
018c761638 Update WAILA 1.9 to HWYLA 1.11 2016-11-26 14:34:54 -08:00
modmuss50
b1b8537159
Fix log spam with some machines, closes #809 #releasebuild 2016-11-26 21:14:57 +00:00
modmuss50
21833839e6
Bump version #releasebuild 2016-11-26 19:17:08 +00:00
modmuss50
7fb93e89e7
Fix #808 2016-11-26 19:15:55 +00:00
modmuss50
3a470df08b
Fix #791 2016-11-26 19:10:29 +00:00
modmuss50
129895e559
Fix #803 2016-11-26 19:05:52 +00:00
modmuss50
6bf0a3b4bb
Add curse tools 2016-11-26 19:05:10 +00:00
modmuss50
757e311804
Fix #804 2016-11-26 19:01:10 +00:00
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 #2 2016-11-25 13:24:01 +00:00
modmuss50
97b233dd44 Fix resources #1 2016-11-25 13:23:42 +00:00
FliegendeWurst
df74ca5176 Fix small formatting and spelling errors in readme (#807) 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