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
modmuss50
ec67e9650d
Fixed building?
2016-03-14 07:56:36 +00:00
modmuss50
849f68bc94
Trying to fix git part 1
2016-03-14 07:55:54 +00:00
modmuss50
4cf4be51c8
Fix building
2016-03-14 07:51:34 +00:00
TheDoctorSoda
801b497d86
Update some texture paths, fix ore harvestibility, and fix ore recipes
2016-03-13 22:25:06 -07:00
TheDoctorSoda
7d5fe7f19a
Changed lots of texture paths. There will be some missing ones, I'll resolve those later.
2016-03-13 20:27:15 -07:00
modmuss50
72b16c2306
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
2016-03-13 21:14:41 +00:00
TheDoctorSoda
2e4327f8cb
Fix reinforced glass
2016-03-13 12:52:37 -07:00
modmuss50
32f25a0141
Its gets to main menu
2016-03-13 18:38:41 +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
05ee9f30f4
Nuke.
2016-03-13 11:50:46 +00:00
modmuss50
28dda59ed5
Rewritten world generation, new ores.json config file
2016-03-11 20:24:05 +00:00
modmuss50
58b202a782
Fixes transparency on glass
2016-03-08 08:33:38 +00:00
TheDoctorSoda
5f77e1b16f
Iron furnace burning particles & [TEXTURES] Iron Furnace textures
2016-03-07 22:33:13 -08:00
TheDoctorSoda
2221a303ad
Move thermal generator TE to proper package
2016-03-07 21:56:37 -08:00
TheDoctorSoda
29c43ddd99
Fix thermal generator texture and adjust nanosaber speed
2016-03-07 20:47:40 -08:00
modmuss50
67526480ad
Added walia support for the cables
2016-03-07 20:33:08 +00:00
gigabit101
02ac62a180
Started Recycler
2016-03-06 23:15:28 +00:00
gigabit101
87d41aaa53
Small code clean up
2016-03-06 20:14:42 +00:00
gigabit101
b99df6f0a8
Iron furnace and Iron alloy furnace now return when broken
2016-03-06 20:09:30 +00:00
gigabit101
90f5d77a41
Finish on Iron furnace
...
Added Jei support to Iron Furnace
2016-03-06 19:59:39 +00:00
gigabit101
961e821402
Start on Iron furnace
2016-03-06 15:58:34 +00:00
gigabit101
e7b7e44a48
Centrifuge texture fix (Still needs side on)
2016-03-06 15:15:53 +00:00
gigabit101
087c97780f
Added reinforced Glass
2016-03-05 23:31:46 +00:00
modmuss50
71062a55bd
Fusion reactor now kills the player, coils to come soon
2016-03-05 19:09:07 +00:00
modmuss50
06d23b10b7
Remove overcomplicated powernet
2016-03-02 15:42:45 +00:00
modmuss50
80d5e00706
Power net work
2016-02-29 17:30:46 +00:00
TheDoctorSoda
3d06e7b4e1
Fix solar panel bottom
2016-02-27 23:15:03 -08:00
modmuss50
4b5d05a063
Started work on the new PowerNetwork
2016-02-27 19:02:28 +00:00
gigabit101
6549282ea0
Cleaned up imports
2016-02-26 13:03:30 +00:00
modmuss50
e3c71248a4
Added solar panel textures that are based on sate
2016-02-26 08:26:24 +00:00
modmuss50
2fbccc696f
Removed Iron Fence gate, it was bugged and is not in GT.
2016-02-25 20:24:26 +00:00
modmuss50
d0392dabb8
Added wind and water mill
2016-02-25 20:03:58 +00:00
gigabit101
9ce8d58062
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-25 18:26:07 +00:00
gigabit101
82d2de7eb1
Start on the new manual
2016-02-25 18:25:52 +00:00
modmuss50
ed3d3c78b5
Added solar panel
2016-02-25 18:21:59 +00:00
gigabit101
1dbb03cf75
Added some grinder recipes
...
Added copper and tin blocks closes #351
2016-02-25 13:59:22 +00:00
gigabit101
46cd99cdf5
Copper and Tin ore
2016-02-25 13:35:12 +00:00
modmuss50
46cdf8f587
Fixes to configs, optimise imports.
2016-02-24 08:18:21 +00:00
modmuss50
240b0029c8
Fixes #353 and #355
2016-02-22 11:09:29 +00:00
TheDoctorSoda
90932acab9
Add iron fence and fence gate
...
Cannot for the life of my figure out why the iron fence gate block won't render correctly. The blockstate isn't being called. Hopefully I can figure out in the morning
2016-02-22 00:11:19 -08:00
TheDoctorSoda
4b8589667b
Extractor texture
2016-02-21 16:02:36 -08:00
TheDoctorSoda
6922f60577
Fix extractor texture paths
2016-02-21 15:44:38 -08:00
TheDoctorSoda
bb7e68eb59
Fix machine sides/add rubber plank texture
2016-02-21 15:08:44 -08:00
TheDoctorSoda
b643162dad
Fix rubber log texture names and fix treetap texture
2016-02-21 13:32:03 -08:00
modmuss50
c8d43d9c69
Added 1 in 4 chance of the log dropping the sap when broken
2016-02-21 16:14:38 +00:00
modmuss50
c06a98422d
Added scrap item, utilise some new textures.
2016-02-21 13:49:49 +00:00
modmuss50
b9f3d9c60a
Custom rubber tree generation algorithm, tress now spawn with sap, and they dont clip other tress. They also have a spike
2016-02-21 13:40:20 +00:00
modmuss50
c5393d3f2b
Added sound effect for sap
2016-02-20 22:56:58 +00:00
gigabit101
0522e9539f
Added some textures
...
Added Tree Tap
Added Tree Tap logic
2016-02-20 22:50:24 +00:00
modmuss50
af7f4a571b
Fixes leaves rendering weird
2016-02-20 19:59:09 +00:00
modmuss50
1f59226e01
Add some stuff, that does things
2016-02-20 19:46:18 +00:00
modmuss50
0ac86ff303
Added sapling
2016-02-20 18:40:35 +00:00
modmuss50
71c2bfee7f
Moved power system to RC and spawn trees in groups
2016-02-20 16:59:31 +00:00
modmuss50
891d2cce32
Added rubber processing
2016-02-20 10:58:58 +00:00
gigabit101
ee2841b5b1
Added machine blocks
2016-02-20 03:47:35 +00:00
gigabit101
f947ef37a4
Added basic battery and fixed issues with Lithium Battery
2016-02-20 03:35:20 +00:00
gigabit101
047625389d
Added compressor, extractor, electric furnace
2016-02-20 03:07:56 +00:00
gigabit101
cd13932bde
Basic generator just needs logic
2016-02-20 02:21:44 +00:00
gigabit101
464d8cac03
Added advancedCircuit and Circuit
2016-02-20 01:08:18 +00:00
gigabit101
aa41d576e3
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-20 00:58:02 +00:00