modmuss50
973f68496c
Merge branch '1.9.4' into 1.9.4-ic2
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:02:19 +01:00
onVoid
039aab3e41
Added grinder recipes for gems -> dust ( #628 )
2016-06-05 22:05:44 +01:00
modmuss50
55e6f70900
Fix last PR
2016-06-05 20:41:54 +01:00
Modmuss50
d5e83cacb6
Merge pull request #626 from onVoid/patch-1
...
Added grinder recipes for ingot -> dust
2016-06-05 20:38:44 +01:00
modmuss50
d84bffce46
Fix nanosaber
2016-06-05 20:37:22 +01:00
onVoid
83e116f4b5
Added grinder recipes for ingot -> dust
2016-06-05 12:36:39 -07:00
modmuss50
4d29af274e
Balance power recipes
2016-06-05 19:43:17 +01:00
modmuss50
bd00b44ab0
Balance power recipes
2016-06-05 11:23:20 +01:00
modmuss50
90ca45dce9
Broken work
2016-06-04 20:20:04 +01:00
modmuss50
87f6ea1eb0
Ic2 recipes?
2016-06-04 20:07:34 +01:00
modmuss50
1a0fb02516
Added config to disable gem tools and armour, closes #617
2016-06-04 11:20:06 +01:00
modmuss50
8a8fd59cc1
Add a way to rename and move the blockstates json file
2016-06-04 11:02:35 +01:00
Yulife
9cbebe6dbd
Shoo IC2 Exp, Shoo
2016-05-30 16:11:40 +02:00
Yulife
341e862e37
Bunch of new item textures, move Lazurite to plates
...
... and relocation of some assets
2016-05-30 13:37:27 +02:00
Prospector
216e801bec
Closes #401
2016-05-28 12:40:11 -07:00
modmuss50
f39a047f49
Fixes #481 and Fixes empty cell texture
2016-05-25 17:23:19 +01:00
modmuss50
e01e4be209
Added the code to show all unused items in recycler recipes
2016-05-25 17:06:12 +01:00
modmuss50
135e3e3be2
Fixes #483
2016-05-25 16:57:50 +01:00
modmuss50
e532a0b276
Fixes #568
2016-05-25 16:53:27 +01:00
modmuss50
1ab33a9473
Use new file server, add more checks to recipes
2016-05-25 11:07:42 +01:00
modmuss50
25ee0b5790
Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture
2016-05-23 18:26:21 +01:00
Prospector
188e2ef0c5
Fix tool tiers
2016-05-23 00:13:11 -07:00
Prospector
d452cf0fe6
Fix
2016-05-22 14:13:38 -07:00
Prospector
be36455415
Rename to tungstenGrindingHead
2016-05-22 14:01:38 -07:00
modmuss50
a24ee95c4d
Fix crash when reloading texture
2016-05-22 21:20:39 +01:00
Yulife
54106e082d
Relocation of assets, TINY DUSTS
2016-05-22 17:19:05 +02:00
Yulife
ab74f1c077
Remove Red Rock, implement new vanilla stones
2016-05-22 16:53:15 +02:00
modmuss50
161eb87246
Remove voidstone, does NOT break worlds
2016-05-22 14:53:56 +01:00
modmuss50
8fb186c39f
Merge remote-tracking branch 'remotes/origin/1.9' into 1.9.4
2016-05-18 20:20:33 +01:00
modmuss50
3509ff4f10
Clean up Ore Dic Registry, should fix INV Tweaks crash
2016-05-18 20:14:50 +01:00
modmuss50
74d500a2fd
Update to minecraft version 1.9.4
2016-05-18 16:53:54 +01:00
modmuss50
7d95dea783
Update Item Registry
2016-05-17 21:39:07 +01:00
modmuss50
e38c800f21
Added Universal Cell
2016-05-17 21:12:33 +01:00
modmuss50
9035f2a21c
Merge branch '1.9' into 1.9-BTM
2016-05-17 19:55:57 +01:00
modmuss50
90c7ab09ec
Fixes #587
2016-05-17 18:41:09 +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
aaeb67f9c4
Fixes #583
2016-05-17 10:28:06 +01:00
modmuss50
4a1226322e
Merge branch '1.9' into 1.9-BTM
2016-05-16 16:21:33 +01:00
modmuss50
89d9dc99e2
Fixes #381 rubber ore dic issue
2016-05-16 16:04:31 +01:00
Prospector
3cf950d491
Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes.
2016-05-15 21:24:35 -07:00
modmuss50
a2063df069
added basic block
2016-05-14 18:53:07 +01:00
modmuss50
fd95cf7141
Some more work on fluid pipe rendering, I may recode it
2016-05-09 16:33:36 +01:00
modmuss50
dd6e69bea5
Start work on fluid pipes
2016-05-09 11:13:52 +01:00
modmuss50
45e31c1aef
Added pump
2016-05-08 21:42:09 +01:00
modmuss50
58371903d3
Fix major gig derp
2016-05-08 21:11:17 +01:00
Prospector
a6cfd90339
get tinkers in the dev env (no compat yet)
2016-05-08 10:26:40 -07:00
modmuss50
caaa5a3e7f
Fix sounds
2016-05-08 11:42:59 +01:00
modmuss50
9c6e9aef64
Update to new forge registry system
2016-05-08 10:13:21 +01:00
modmuss50
140b03960e
Fixes #557
2016-05-08 09:24:16 +01:00
modmuss50
a060c33e5a
Fixes #522
2016-05-07 13:45:33 +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
Prospector
d1ca1eaa74
Remove some crap
2016-04-24 10:57:44 -07:00
Prospector
c3f79d6c6f
Update Forge
2016-04-23 13:11:30 -07:00
modmuss50
b822cee9fb
Update walia, add MT and CT support back, Fix #519 , update for new RC bucket thing
2016-04-13 13:47:02 +01:00
modmuss50
ef133ab25b
Start on tile rewrite
2016-04-11 17:23:57 +01:00
gigabit101
169c8e5ceb
Fixed copper and tin ore ore dict issues
2016-04-10 22:50:05 +01:00
gigabit101
316375ee3a
Fixed copper not being oredict
2016-04-10 14:35:28 +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
be2a3f4006
Fixes #469
2016-04-01 20:13:50 +01:00
modmuss50
a9d814e777
Fixes #480
2016-04-01 20:10:32 +01:00
gigabit101
7369288829
nothing to see here
2016-04-01 17:16:34 +01:00
gigabit101
45174e40ec
closes #477
2016-04-01 13:06:49 +01:00
Prospector
77104b39ce
Recipe changes and DOGECOIN
2016-03-29 22:45:15 -07:00
Prospector
4af72aed00
Fix Transformer Upgrade Recipe
2016-03-29 17:43:35 -07:00
Prospector
42c0ad2bfc
fix more recipes
2016-03-29 03:01:23 -07:00
Stuart Pomeroy
5216082445
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-03-29 10:31:08 +01:00
Stuart Pomeroy
af7a0e4fd3
Remove test item.
2016-03-29 10:30:55 +01:00
Prospector
b06c454634
Upgrade recipes
2016-03-29 02:17:48 -07:00
Modmuss50
1fa014c098
I may have broken a lot of recipes, can someone check? But it should fix #474
2016-03-29 09:36:00 +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
gigabit101
ae30dc7685
Added some plate recipes
2016-03-28 21:52:51 +01:00
gigabit101
5b40c9e88e
Removed dupe recipes
2016-03-28 21:37:55 +01:00
gigabit101
c1860d6326
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-03-28 21:33:41 +01:00
gigabit101
1cfa5e79e7
more Recipes
2016-03-28 21:33:36 +01:00
Prospector
2297eef08d
Fix scrapbox loot and add another glass fibre cable recipe
2016-03-28 12:54:17 -07:00
Modmuss50
fe916ae6b2
Merge branch '1.9' of https://github.com/MrBretze/TechReborn into MrBretze-1.9
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-03-28 19:32:06 +01:00
gigabit101
8fe61a9c54
Recipes for all gem tools and armor
2016-03-28 18:31:32 +01:00
gigabit101
1136574bc2
Chainsaw recipes
2016-03-28 18:13:52 +01:00
Stuart Pomeroy
427963b40a
Closes #434 , Add tooltips to grinder and batbox. Fix centrifuge. closes #436
2016-03-28 17:50:25 +01:00
MrBretzel
581b3c8358
The dev is the end
2016-03-28 16:46:29 +02:00
MrBretzel
b503feed8a
Force adding ItemStack to Scrapbox List
2016-03-28 16:45:22 +02:00
MrBretzel
a1335f118a
New system for recycler registry, juste wool and clay not work, i d'ont why this not work :/
2016-03-28 16:29:26 +02:00
Stuart Pomeroy
e91a1c2ff1
Closes #433 and fixes a bug i found with #434
2016-03-28 13:57:43 +01:00
Stuart Pomeroy
69507da776
Fix some of #434 , waiting on @gigabit101
2016-03-28 13:42:06 +01:00
Stuart Pomeroy
6054610c3c
Fixes lava cells, closes #419
2016-03-28 12:54:41 +01:00
Prospector
d0f27cb941
Add more scrapbox loot (and dev heads to the loot! woo)
2016-03-28 02:24:15 -07:00
Prospector
28fd887ee3
Ruby, sapphire, and peridot armour
2016-03-27 22:48:31 -07:00
Prospector
a636da1882
Bronze Tools and Armour
2016-03-27 21:20:27 -07:00
Stuart Pomeroy
78e8acce7b
Fixed some GUIS and some Mass Fabs
2016-03-27 20:10:49 +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
a1078a4951
Added WIP tool tip
2016-03-23 18:59:39 +00:00
gigabit101
1d9fe100b1
Recipes and debug texture
2016-03-23 18:45:58 +00:00
gigabit101
a999d5064a
another recipe
2016-03-23 18:19:42 +00:00
gigabit101
5c7035c389
Added a but ton of recipes
2016-03-23 18:17:37 +00:00
modmuss50
ab19d71ede
Moved shields to RebornCore
2016-03-22 20:30:59 +00:00
modmuss50
4f3d9ddfca
Shields
2016-03-21 19:36:54 +00:00
modmuss50
5fde39ebcd
Some improvements to things
2016-03-20 21:23:12 +00:00
modmuss50
b31806d004
Added more recipe things
2016-03-20 17:23:36 +00:00
modmuss50
d66c2e8301
Added debug items
2016-03-20 16:43:25 +00:00
gigabit101
f3016ed07d
Some recipes
2016-03-20 15:28:40 +00:00
gigabit101
d9666edb4f
few little grinder recipes
2016-03-20 01:05:53 +00:00
gigabit101
2fa00b9c7f
little fixs
2016-03-19 23:18:31 +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
51539f4ec8
Remove item transformers
2016-03-16 17:04:19 +00:00
modmuss50
5a0f8be435
Added transformers
2016-03-16 16:54:44 +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
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
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
7a121be651
Some small fixes
2016-03-13 16:57:10 +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
82043cadc4
Move config files into own dir
2016-03-11 13:09:59 +00:00
TheDoctorSoda
2221a303ad
Move thermal generator TE to proper package
2016-03-07 21:56:37 -08:00
gigabit101
626cbbbbc7
derp
2016-03-07 17:26:04 +00:00
gigabit101
080b633493
Finish up on recycler and temp jei handler
2016-03-07 14:07:52 +00:00
gigabit101
007f9266e5
Recycler output is now a random chance
2016-03-07 12:45:54 +00:00
TheDoctorSoda
f170f9a418
Fix Scrapbox JEI handler localisation
2016-03-06 23:56:15 -08:00
TheDoctorSoda
1a1ec6fee8
[TEXTURES] Energy storage upgrade and wrench update & more scrapbox loot
2016-03-06 23:47:17 -08:00
TheDoctorSoda
38af4881b4
Started nanosaber, needs work but wanted to get the item in.
2016-03-06 23:01:02 -08:00
TheDoctorSoda
ca3cd6d4f8
Scrapbox JEI handler and modified some scrapbox recipes
...
This is my first JEI handler, kinda just stole it from the compressor. hope I did good?
2016-03-06 22:23:25 -08:00
gigabit101
77e2edc005
More work on recycler
2016-03-07 00:21:22 +00:00
gigabit101
02ac62a180
Started Recycler
2016-03-06 23:15:28 +00:00
gigabit101
059b197d5c
More recipe tweaks
2016-03-06 21:00:42 +00:00
gigabit101
d02424070d
Recipe tweak
2016-03-06 20:22:43 +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
9161133585
battery recipe
2016-03-06 15:09:05 +00:00
modmuss50
7a5c7df9c2
Standalone Cable items
2016-03-06 14:51:13 +00:00
gigabit101
188cee7b3b
Added Cable recipes
2016-03-06 14:46:30 +00:00
gigabit101
066d329388
test recipe
2016-03-06 14:26:08 +00:00
gigabit101
56caa00e46
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 13:48:52 +00:00
gigabit101
398309ab0c
Added refined Iron Recipe
2016-03-06 13:48:48 +00:00
modmuss50
7de133eb5c
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 13:37:54 +00:00
modmuss50
8b5a2dc87a
Fixes recipe crashing
2016-03-06 13:37:46 +00:00
gigabit101
fcb8cc0a8e
Compressor Jei Support
2016-03-06 13:33:35 +00:00
gigabit101
391b28e50f
Added Extractor JEI support thanks @mezz for making this so easy :)
2016-03-06 13:20:38 +00:00
gigabit101
087c97780f
Added reinforced Glass
2016-03-05 23:31:46 +00:00
gigabit101
0f505c8b6b
More Recipes
2016-03-05 23:31:32 +00:00
gigabit101
bbfa430e96
Added recipe to wrench
2016-03-05 23:04:40 +00:00
gigabit101
382c38ed10
added a few more recipes
2016-03-05 22:50:51 +00:00
gigabit101
3302d63385
Added lapatron and energy crystals
2016-03-05 22:50:39 +00:00
gigabit101
5400dff4d3
some recipes
2016-03-05 22:27:38 +00:00
gigabit101
cda9b4ff81
spent a hour trying to figure out why I was crashing
2016-03-05 20:37:04 +00:00
gigabit101
694aae55ff
some recipe things
2016-03-05 19:42:22 +00:00
TheDoctorSoda
3c3591cec2
Treetap recipe and [TEXTURES] uu matter change
2016-03-02 17:16:35 -08:00
modmuss50
5e82463330
Initial port of cables from kotlin
2016-03-02 16:29:51 +00:00
modmuss50
06d23b10b7
Remove overcomplicated powernet
2016-03-02 15:42:45 +00:00
TheDoctorSoda
9e5f223a42
Added jackhammers
2016-02-28 11:18:59 -08:00
TheDoctorSoda
74caaf6bd6
Made chainsaws share code
2016-02-27 16:49:50 -08:00
modmuss50
e4b8918224
More work on the cables, and add items
2016-02-27 19:36:01 +00:00
modmuss50
4b5d05a063
Started work on the new PowerNetwork
2016-02-27 19:02:28 +00:00
modmuss50
7ef16b475b
Idea broke the imports, here is the fix
2016-02-26 21:51:34 +00:00
modmuss50
e8539eadd3
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-26 21:47:16 +00:00
modmuss50
9507c92d94
Added wrench
2016-02-26 21:46:55 +00:00
gigabit101
6549282ea0
Cleaned up imports
2016-02-26 13:03:30 +00:00
gigabit101
80df0b6d2c
fixed recipe derp
2016-02-26 12:57:15 +00:00
TheDoctorSoda
4efb322ccd
Fix drill tier and charge configs and add chainsaws
2016-02-25 17:42:24 -08:00
modmuss50
2fbccc696f
Removed Iron Fence gate, it was bugged and is not in GT.
2016-02-25 20:24:26 +00:00
modmuss50
b907e62a45
Some new recipes
2016-02-25 20:21:57 +00:00
modmuss50
ef62b8909c
Remove debug recipes
2016-02-25 20:13:39 +00:00
modmuss50
d0392dabb8
Added wind and water mill
2016-02-25 20:03:58 +00:00
modmuss50
efbf4c59bb
Added a load of new parts
2016-02-25 18:37:29 +00:00
modmuss50
9a1136fe25
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-25 18:28:20 +00:00
modmuss50
a8cf7fbb87
Added lava and water cells
2016-02-25 18:28:13 +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
7d6c982847
Fixed a bad recipe
2016-02-25 14:31:18 +00:00
gigabit101
3274894625
Added hammer and some basic plate recipes
2016-02-25 14:16:08 +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
TheDoctorSoda
45047be17b
Added loot and rubber tree configs
2016-02-23 21:26:57 -08:00
TheDoctorSoda
d7474fec45
Added copper and tin to dungeon loot
2016-02-23 21:07:18 -08:00
TheDoctorSoda
9dacfe3c7b
Add rubber saplings as chest loot.
2016-02-23 20:24:50 -08:00
modmuss50
56b1619ca6
Register some more replacement blocks/items
2016-02-23 08:38:32 +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
bb7e68eb59
Fix machine sides/add rubber plank texture
2016-02-21 15:08:44 -08:00
gigabit101
b613b1e419
Drills
2016-02-20 23:04:32 +00:00
gigabit101
0522e9539f
Added some textures
...
Added Tree Tap
Added Tree Tap logic
2016-02-20 22:50:24 +00:00
modmuss50
0cf477dd89
Some small changes and fixes.
2016-02-20 21:01:14 +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
defde302fe
Added machine block recipe last commit for night
2016-02-20 03:57:15 +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
modmuss50
cfab240ac7
Added some more items
2016-02-20 01:32:08 +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
gigabit101
8ad4a45716
Added basic Grinder
2016-02-20 00:57:57 +00:00
modmuss50
a76384504f
Rubber Trees
2016-02-20 00:55:18 +00:00
modmuss50
9268fa4d55
1117 lines of new recipes?
...
Added a new recipe manager to allow us to list the missing items that need to be reimplemented.
2016-02-19 20:32:26 +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
modmuss50
25777b3f96
Fixes #217
2016-02-16 10:00:03 +00:00
modmuss50
bf691fd8a6
Fixes #313
2016-02-16 09:07:22 +00:00
modmuss50
b3bec47b11
Fixes #313
2016-02-06 11:51:55 +00:00
modmuss50
8ec95f9119
Now using new Forge Dynamic buckets, and prep for new update
2016-02-02 21:05:42 +00:00
modmuss50
3909a868aa
Revert "Revert "Fix bucket issues""
...
This reverts commit d5b880387a
.
# Conflicts:
# src/main/java/techreborn/items/tools/ItemFluidbucket.java
2016-01-22 17:41:47 +00:00
modmuss50
d5b880387a
Revert "Fix bucket issues"
...
This reverts commit 43768b9310
.
2016-01-16 17:50:18 +00:00
modmuss50
43768b9310
Fix bucket issues
2016-01-16 15:54:41 +00:00
modmuss50
b242ec5c5f
Cut all the things!
2016-01-02 01:40:11 +00:00
modmuss50
cf800a905b
Fixes #309 and might help #314
2016-01-01 20:35:58 +00:00
Modmuss50
0fdba82490
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
...
# Conflicts:
# src/main/java/techreborn/compat/CompatManager.java
2015-12-16 17:10:25 +00:00
Modmuss50
0c80f2beda
More recipes, work on #182
2015-12-16 16:40:47 +00:00
Modmuss50
7c48afa63c
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
2015-12-14 17:47:28 +00:00
Modmuss50
6df6dbfdf5
Fixes #300
2015-12-14 17:45:06 +00:00
modmuss50
d5e2628f7a
Some small tweaks
2015-11-28 12:51:49 +00:00
modmuss50
6679c595c5
Some attempts at getting fluid to render.
2015-11-27 20:41:02 +00:00
modmuss50
0d4b9afd01
All Items now have textures
2015-11-27 20:17:12 +00:00
Modmuss50
52af3d2d2d
Removed null recipes
2015-11-27 13:15:19 +00:00
Modmuss50
b0784c44d2
Fixes for latest forge and more rendering.
2015-11-26 17:35:31 +00:00
Modmuss50
30879a534a
859
2015-11-23 19:19:18 +00:00
Modmuss50
92ca6548c6
2211
2015-11-23 15:15:42 +00:00
Modmuss50
f0a70fa478
5235
2015-11-23 14:40:30 +00:00
modmuss50
d545521d04
Added PlayerDectector closes #286
2015-11-22 11:16:54 +00:00
Modmuss50
2c31b9211c
Started work on the player detector.
2015-11-18 20:59:08 +00:00
Modmuss50
3114576e7b
Most of the Vacuum Freezer(Not working just yet)
2015-11-17 21:48:06 +00:00
Modmuss50
a63128aa7e
Added Fusion Reactor
2015-11-16 21:10:39 +00:00
Modmuss50
f42c127201
Added basic fustion reactor multiblock checking.
2015-11-16 15:20:19 +00:00
Modmuss50
7e07320844
Removed unused imports
2015-11-12 19:50:20 +00:00
Modmuss50
08b570ea36
Fixes #244
2015-11-11 17:08:41 +00:00
Modmuss50
842fa421ae
Fixes #243
2015-11-11 17:00:18 +00:00
Modmuss50
2dd4e93f41
Cleaned up ore recipes, closes #241
2015-11-11 16:46:50 +00:00
Modmuss50
f4a3e87ebb
Fixes #233
2015-11-11 15:54:19 +00:00
Modmuss50
faa1d079cd
Added a handfull of recipes for #182
2015-11-11 11:21:10 +00:00
Modmuss50
3799eb3eb2
Work for #182
2015-11-11 08:33:05 +00:00
modmuss50
d4222693c0
Cleaned up Item Power System
2015-11-08 13:59:36 +00:00
modmuss50
ef03cf50a9
Merge branch 'master' of https://github.com/TechReborn/TechReborn
...
Conflicts:
src/main/java/techreborn/asm/LoadingPlugin.java
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
src/main/java/techreborn/client/render/MultiblockRenderEvent.java
src/main/java/techreborn/compat/recipes/RecipesIC2.java
src/main/java/techreborn/init/ModItems.java
src/main/java/techreborn/lib/Location.java
src/main/java/techreborn/packets/PacketPipeline.java
src/main/java/techreborn/partSystem/fmp/CableConverter.java
2015-11-08 12:34:18 +00:00
modmuss50
8abf6e5282
Moved to RebornCore
2015-11-08 12:15:45 +00:00
Modmuss50
a8c9b71e47
Some work on the ore Unifier, for #225
2015-11-07 09:12:44 +00:00
modmuss50
bffbd31cab
Sort of Revert "why was this done twice"
...
This reverts commit 363adeb681
.
Fixes #209
2015-11-01 16:24:35 +00:00
Modmuss50
cd32fe255c
Added ore dic for gems back, fixes #188
2015-10-12 07:54:28 +01:00
modmuss50
a34a005b7b
Fixes #183
2015-10-10 16:45:12 +01:00
gigabit101
891a5f5d19
closes 179
2015-10-09 22:19:38 +01:00