Commit graph

453 commits

Author SHA1 Message Date
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
83ef3e7577 Start of new texturesm, again 2016-11-28 12:54:44 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +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
d9d8845d6d
Added flare, still needs some textures 2016-11-06 19:14:43 +00:00
modmuss50
dda189fbc6
Add Electric Treetap & Make sap go directly into inventory : From: 2aa69a1425eb8928d530c58e7c8a2495e71ea78f 2016-11-05 16:33:27 +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
c9ff3330ca
Fix #794, 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
cff4878eb0
Fix rubber sapling finding top most block of world to grow from. Fixes #782 2016-11-04 20:04:27 +00:00
modmuss50
796df6c055
Auto Format code 2016-10-08 20:46:16 +01:00
modmuss50
0cfb337809 Fix #751 fix creation of invalid machine block itemstacks 2016-09-27 18:24:38 +01:00
modmuss50
8a0d981018 Revert "Fusion reactor fixes & rewrite, energy fixes."
This reverts commit 06fad2264f.
2016-08-10 00:30:08 +01:00
modmuss50
22fd152ec9 Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
This reverts commit be4f10b975.

# Conflicts:
#	src/main/java/techreborn/init/ModBlocks.java
2016-08-10 00:29:47 +01:00
modmuss50
cb44c79256 Remove needed block, update forge 2016-08-01 09:37:55 +01:00
Dragon2488
c8301e4db3 Veins ore generation system. WIP. 2016-08-01 01:12:55 +07:00
Dragon2488
be4f10b975 Energy storages item charging fixes, transformers fixes, electric items fixes. 2016-07-25 15:10:55 +07:00
Dragon2488
b42b5274b5 Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix. 2016-07-25 02:26:15 +07:00
Dragon2488
0011553cf7 Sawmill changes & fixes. 2016-07-24 01:10:37 +07:00
Dragon2488
06fad2264f Fusion reactor fixes & rewrite, energy fixes. 2016-07-22 21:45:55 +07:00
al132
f4cd3fc818 Leaves Constructor reverted 2016-07-18 23:37:02 -05:00
al132
7a6df30d10 Rubber and recipe fixes 2016-07-18 23:26:41 -05:00
Dragon2488
33df1d3319 Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. (#673) 2016-07-16 10:44:54 +01: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
Yulife
b09e60f774 Electrolyzer 2016-06-02 21:31:58 +02:00
modmuss50
401093a70b Fix player detectors 2016-05-23 17:22:50 +01:00
modmuss50
55c7f68d75 Remove Distributor from creative tab 2016-05-22 21:40:32 +01:00
Prospector
8fffe67f17 Update to use new ChatUtils 2016-05-21 21:51:26 -07:00
modmuss50
dbaed2721e Fixes #590 and fixes build 2016-05-21 20:05:13 +01:00
modmuss50
1efa303bad Fixes #593 2016-05-21 20:01:03 +01:00
modmuss50
74d500a2fd Update to minecraft version 1.9.4 2016-05-18 16:53:54 +01:00
modmuss50
9035f2a21c Merge branch '1.9' into 1.9-BTM 2016-05-17 19:55:57 +01:00
modmuss50
7e2db4a715 Rewrote fluids
Now uses json files
Now uses forge bucket
Now not broken, closes #557
2016-05-17 18:36:51 +01:00
modmuss50
c20c6d4722 Fixes #496 and update Json-Destoyer 2016-05-17 11:41:37 +01:00
modmuss50
0ac27fd90e Fixes #585 2016-05-17 10:35:00 +01:00
modmuss50
4a1226322e Merge branch '1.9' into 1.9-BTM 2016-05-16 16:21:33 +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
61bf289f43 Complete Distributor 2016-05-15 09:53:38 +01:00
modmuss50
3eb4eec55a Merge branch '1.9' into 1.9-BTM 2016-05-15 09:39:05 +01:00
Prospector
36d736686b Fix TRArmour texture caps 2016-05-14 14:58:09 -07:00
modmuss50
a170177980 Some more work 2016-05-14 19:26:04 +01:00
modmuss50
a2063df069 added basic block 2016-05-14 18:53:07 +01:00
modmuss50
45e31c1aef Added pump 2016-05-08 21:42:09 +01:00
modmuss50
caaa5a3e7f Fix sounds 2016-05-08 11:42:59 +01:00
modmuss50
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
Prospector
44f2588b4e Update JEI compat 2016-04-30 20:01:10 -07:00
Prospector
994d12a850 Remove lots of useless stuff (will break existing worlds) 2016-04-29 21:21:28 -07:00
modmuss50
a2d626bc61
Fixes #523 2016-04-23 13:32:03 +01:00
modmuss50
e7f9c679df
Update forge and deps 2016-04-23 13:05:39 +01:00
modmuss50
b06d89cf93
fixes #522 2016-04-14 07:53:29 +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
modmuss50
a37693b8da Fixes #479 2016-04-01 20:08:40 +01:00
modmuss50
04f0736568 Fixes #465 2016-04-01 19:35:27 +01:00
Prospector
88fbcb1aaf Fix lightning rod texture 2016-03-29 19:01:21 -07:00
Stuart Pomeroy
4c2877d0d5 Rewrite Transformers, closes #441 2016-03-29 10:29:51 +01:00
Prospector
58902f3901 Quite a bit of fixes/additions 2016-03-29 00:30:05 -07:00
Prospector
cec54aa0c8 Fix lots of issues 2016-03-28 19:47:00 -07:00
Stuart Pomeroy
427963b40a Closes #434, Add tooltips to grinder and batbox. Fix centrifuge. closes #436 2016-03-28 17:50:25 +01:00
Stuart Pomeroy
d51a772979 Fix Wrenching, closes #418 2016-03-28 13:35:59 +01:00
Stuart Pomeroy
6ff03bc706 Fix block item drops and such. Closes #428 2016-03-28 12:23:55 +01:00
Stuart Pomeroy
c25ab8227a Update the Tiles for Storage. Also work on Drops. Not Finished. 2016-03-28 11:45:21 +01:00
Stuart Pomeroy
fffeb93ff1 Fix Solar panels 2016-03-28 10:09:26 +01:00
Stuart Pomeroy
dfb7d0afd4 Fix Merges 2016-03-27 20:14:13 +01:00
gigabit101
f4b32cfcef closes #432 2016-03-27 20:11:39 +01:00
Stuart Pomeroy
78e8acce7b Fixed some GUIS and some Mass Fabs 2016-03-27 20:10:49 +01:00
gigabit101
ea9b92139e closes #431 2016-03-27 20:08:51 +01:00
gigabit101
2360df0148 closes #429 2016-03-27 19:53:55 +01:00
Stuart Pomeroy
525a91e931 Fixes solar panels being powered wierdly... 2016-03-27 18:25:45 +01:00
gigabit101
4861364cd6 blocks are hard ;) 2016-03-26 16:17:56 +00: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
887708d128 Fixed player detector crash 2016-03-23 20:10:08 +00:00
modmuss50
244ade085d Some small fixes 2016-03-23 20:00:00 +00:00
modmuss50
f0d6b9e78d Can now place blocks facing up and down 2016-03-23 17:02:21 +00:00
gigabit101
17ff9b2aad some texture fixs 2016-03-23 16:53:32 +00:00
gigabit101
123e704caf fixed some machine drops 2016-03-22 23:34:43 +00:00
gigabit101
8f382f2239 stuff and things 2016-03-21 15:30:32 +00:00
modmuss50
5460f2f9a2 Fixed crashes 2016-03-20 12:10:23 +00:00
modmuss50
232fe0b625 Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-20 11:10:06 +00:00
modmuss50
d5935af4e3 Fixes missing ore texture 2016-03-19 10:10:53 +00:00
modmuss50
e319398bc9 Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-16 17:09:34 +00:00
modmuss50
04f58c1ebe Added textures to transformers 2016-03-16 17:08:57 +00:00
modmuss50
5a0f8be435 Added transformers 2016-03-16 16:54:44 +00:00
modmuss50
04edbabdf4 fix compile error 2016-03-16 16:39:40 +00:00
modmuss50
f532ce15c0 Stop nuke's exploding when broken 2016-03-16 16:38:44 +00:00
modmuss50
00fc80b071 Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-16 16:26:44 +00:00
modmuss50
65a64e650b Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-03-16 15:52:36 +00:00
modmuss50
929d2f4b7f Improvements to the nuke, rendering needs fixing 2016-03-16 15:52:27 +00:00
modmuss50
8c24711d4f Optimise imports 2016-03-15 08:13:05 +00:00
modmuss50
e0547cecff Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-15 08:07:06 +00:00
TheDoctorSoda
e90592403b Added Scrapboxinator, reverted yellow energy outlines, added grinder textures 2016-03-14 21:53:05 -07:00
TheDoctorSoda
bb16153e77 Fix MFE and MFSU paths 2016-03-14 11:25:12 -07:00
modmuss50
b7c71edf4f Added MFE and MFSU blocks and tiles, gui and textures to come later 2016-03-14 08:34:15 +00:00
modmuss50
5480a5c3e5 Added batBox, gui to come later 2016-03-14 08:26:41 +00:00