gigabit101
e7b7e44a48
Centrifuge texture fix (Still needs side on)
2016-03-06 15:15:53 +00:00
gigabit101
b6f29f8aee
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 15:09:15 +00:00
gigabit101
9161133585
battery recipe
2016-03-06 15:09:05 +00:00
modmuss50
f4d74f7486
Wrench crash fix, cable drop items, cables have hardness
2016-03-06 15:02:17 +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
modmuss50
a921751618
Fixed recipe issues, again
2016-03-06 14:28:45 +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
e71a43f038
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 13:33:45 +00:00
gigabit101
fcb8cc0a8e
Compressor Jei Support
2016-03-06 13:33:35 +00:00
modmuss50
6462569b73
Temp fix for #371
2016-03-06 13:30:31 +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
e96fe4bea7
grinder now returns grinder
2016-03-05 23:31:22 +00:00
gigabit101
bbfa430e96
Added recipe to wrench
2016-03-05 23:04:40 +00:00
gigabit101
a9ad808dcb
Added missing localization
2016-03-05 23:00:12 +00:00
gigabit101
f1cbfc471b
set wrench stack size to 1
2016-03-05 22:56:52 +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
modmuss50
71062a55bd
Fusion reactor now kills the player, coils to come soon
2016-03-05 19:09:07 +00:00
modmuss50
1e24d1f116
Texture Rendering for cables
2016-03-05 18:10:36 +00:00
TheDoctorSoda
4000dbcc55
get rid of ugly lines
2016-03-05 10:07:51 -08:00
TheDoctorSoda
41b4e1027e
insulated copper cable texture
2016-03-05 09:07:48 -08:00
TheDoctorSoda
657a12a3b3
Copper cable texture
2016-03-05 08:53:36 -08:00
modmuss50
a94039a5c2
More cable work
2016-03-05 14:24:31 +00:00
modmuss50
7d514b718a
Fixes #369 and fixes rubber tree spikes not decaying
2016-03-05 11:37:29 +00:00
modmuss50
0204ddc539
Cables render, need textures
2016-03-05 11:19:33 +00:00
modmuss50
e3c150c06e
Inital cable rendering
...
This only took 2 hours :/
2016-03-05 10:48:13 +00:00
modmuss50
0b04bb8c69
Some more work on rendering
2016-03-04 19:47:08 +00:00
TheDoctorSoda
3c3591cec2
Treetap recipe and [TEXTURES] uu matter change
2016-03-02 17:16:35 -08:00
modmuss50
df9c159435
Ported the rendering code
2016-03-02 16:45:49 +00:00
modmuss50
1d72578973
Remove commented out code
2016-03-02 16:33:59 +00: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
modmuss50
e448bd1317
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-02 13:53:08 +00:00
modmuss50
7d37157c08
Fixes #303
2016-03-02 13:52:17 +00:00
gigabit101
c5dabec844
Note for @modmuss50
2016-03-01 16:33:33 +00:00
gigabit101
65266317b3
Cable types
2016-03-01 16:32:06 +00:00
gigabit101
2e10f10197
closes #368
2016-03-01 16:13:53 +00:00
modmuss50
80d5e00706
Power net work
2016-02-29 17:30:46 +00:00
modmuss50
6de20dcba1
Fix crash with temp thaumcraft integration
2016-02-29 13:30:14 +00:00
modmuss50
e680f3fb1f
Updates, and re added support
2016-02-29 11:20:40 +00:00
TheDoctorSoda
158f68c4a8
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-29 00:20:28 -08:00
TheDoctorSoda
c5cfa0890d
[TEXTURES] Massive storage block, plate, and ingot overhaul
2016-02-29 00:19:49 -08:00
modmuss50
b0cb4f87c5
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
...
# Conflicts:
# src/main/java/techreborn/items/tools/ItemWrench.java
2016-02-29 08:15:23 +00:00
TheDoctorSoda
2a83a982c3
A few plate textures
2016-02-28 13:22:06 -08:00
TheDoctorSoda
9e5f223a42
Added jackhammers
2016-02-28 11:18:59 -08:00
TheDoctorSoda
3d06e7b4e1
Fix solar panel bottom
2016-02-27 23:15:03 -08:00
TheDoctorSoda
02ff95c60c
Changed hammer sound to lower pitched wrench sound
2016-02-27 22:22:27 -08:00
TheDoctorSoda
34046e9ef4
Chainsaws effective on leaves, and are affected by unbreaking enchantment, along with the drills
2016-02-27 22:00:22 -08:00
TheDoctorSoda
d543554856
[TEXTURES] Re Battery tweak
2016-02-27 16:52:45 -08:00
TheDoctorSoda
74caaf6bd6
Made chainsaws share code
2016-02-27 16:49:50 -08:00
TheDoctorSoda
4949dd0cf5
Copper and gold wire textures
2016-02-27 13:53:13 -08:00
modmuss50
e4b8918224
More work on the cables, and add items
2016-02-27 19:36:01 +00:00
modmuss50
1cd886e770
Made it compile
2016-02-27 19:03:10 +00:00
modmuss50
4b5d05a063
Started work on the new PowerNetwork
2016-02-27 19:02:28 +00:00
modmuss50
52b248ceab
Some changes to the wrench
2016-02-27 09:15:14 +00:00
mezz
11a31e7bcd
Fix #359 JEI Alloy Smelter is not showing stack amount required
2016-02-27 00:51:39 -08:00
TheDoctorSoda
a212e465dc
Hammer plays anvil sound
2016-02-26 20:11:29 -08:00
TheDoctorSoda
21c5866d0d
[TEXTURES] scrapBox.png
...
not sure why it says the semifluid generator was updated...I didn't change anything
2016-02-26 19:42:35 -08:00
modmuss50
d30b69c88d
Remove test as it is pointless
2016-02-26 21:54:22 +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
acb5bfedf1
More manual stuff
2016-02-26 14:35:13 +00:00
gigabit101
6549282ea0
Cleaned up imports
2016-02-26 13:03:30 +00:00
gigabit101
f61dde634a
Removed old manual class's to fix build
2016-02-26 13:00:42 +00:00
gigabit101
80df0b6d2c
fixed recipe derp
2016-02-26 12:57:15 +00:00
gigabit101
19e66c1c93
More work on the new manual
2016-02-26 12:56:15 +00:00
gigabit101
e01fe31da8
small tweaks for new manual gui
2016-02-26 10:03:30 +00:00
modmuss50
e3c71248a4
Added solar panel textures that are based on sate
2016-02-26 08:26:24 +00:00
TheDoctorSoda
76665a0360
[TEXTURES] advanced alloy
2016-02-25 22:04:26 -08:00
TheDoctorSoda
0139b29947
[TEXTURES] Solar and Thermal Generator
2016-02-25 21:07:10 -08:00
TheDoctorSoda
574f3277d6
[TEXTURES] Thermal and Solar Generator Textures
2016-02-25 20:45:48 -08:00
TheDoctorSoda
c9b6c71ce2
[TEXTURES] Copper, tin, bronze, and steel block textures
2016-02-25 19:54:16 -08:00
TheDoctorSoda
b68647ffa0
[TEXTURES] Manual update
2016-02-25 19:32:33 -08:00
TheDoctorSoda
2a12cb1ad2
[TEXTURE] hammer time!
2016-02-25 19:05:22 -08:00
TheDoctorSoda
2f03b20bea
Fix chainsaws extending Pickaxe not Axe
2016-02-25 19:01:02 -08:00
TheDoctorSoda
da746be39b
[TEXTURES] Lava and Water cell
2016-02-25 18:00:14 -08:00
TheDoctorSoda
6978e14652
Actually add chainsaws (last commit was a lie)
2016-02-25 17:42:45 -08:00
TheDoctorSoda
4efb322ccd
Fix drill tier and charge configs and add chainsaws
2016-02-25 17:42:24 -08:00
modmuss50
ec054e09f6
Rebalance the windmill
2016-02-25 20:29:56 +00:00
modmuss50
bb6b53490b
Fix build issue
2016-02-25 20:27:58 +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
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
modmuss50
ba19a60fcc
Revert "Disabled WAILA support till lag fix"
...
This reverts commit 9c5aaae874
2016-02-25 17:35:47 +00:00
gigabit101
7d6c982847
Fixed a bad recipe
2016-02-25 14:31:18 +00:00
gigabit101
fb12bfab9e
Changed upgrade slots to SlotUpgrade
2016-02-25 14:21:31 +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
4ed305c9bb
Added copper and tin to world gen
2016-02-25 13:39:17 +00:00
gigabit101
46cd99cdf5
Copper and Tin ore
2016-02-25 13:35:12 +00:00
gigabit101
cebb49555a
Added grinder jei support
2016-02-25 13:17:33 +00:00
gigabit101
9c5aaae874
Disabled WAILA support till lag fix
2016-02-25 13:17:17 +00:00
modmuss50
fff846b512
RF power tool tips, tell me where I missed them
2016-02-24 21:10:44 +00:00
modmuss50
b61acffc68
Generator logic
2016-02-24 16:11:07 +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
TheDoctorSoda
a14cd2b730
More ingots!
2016-02-23 17:04:56 -08:00
TheDoctorSoda
32c43e379b
Change some ingot textures
2016-02-23 16:43:03 -08:00
modmuss50
56b1619ca6
Register some more replacement blocks/items
2016-02-23 08:38:32 +00:00
TheDoctorSoda
6d319c0694
Neutron Reflectors
2016-02-22 15:54:01 -08: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
502fae9518
Fix rubber sapling texture
2016-02-21 18:42:36 -08:00
TheDoctorSoda
17b0bc2d36
Circuit board textures and GUI texture consistency changes
2016-02-21 18:03:52 -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
88ba22ff69
Wrench and Electric Wrench textures
2016-02-21 15:36:04 -08:00
TheDoctorSoda
ff96c20c9c
Update lang file
2016-02-21 15:24:00 -08:00
TheDoctorSoda
bb7e68eb59
Fix machine sides/add rubber plank texture
2016-02-21 15:08:44 -08:00
TheDoctorSoda
571e1aa033
Fix iron shovel mining speed for drill
2016-02-21 15:02:05 -08:00
TheDoctorSoda
fef7210378
Chainsaw textures (and diamond+iron textures I forgot in last commit)
2016-02-21 14:55:17 -08:00
TheDoctorSoda
1a9c2fd3d5
Drill textures
2016-02-21 14:18:25 -08:00
TheDoctorSoda
18a89d1e08
Update electronic circuit texture
2016-02-21 14:00:47 -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
28dd5044e6
Fixes #347
2016-02-21 14:16:55 +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
TheDoctorSoda
aad0da93cc
Update treetap texture
2016-02-21 10:06:26 +00:00
TheDoctorSoda
8b0e487bff
Added scrap texture
2016-02-21 10:04:34 +00:00
TheDoctorSoda
b98b8fd320
Added Compressor, E. Furnace, and Generator textures. (And modified electric alloy furnace)
2016-02-21 10:03:26 +00:00
gigabit101
ba5019867e
Drill tweaks
2016-02-20 23:19:06 +00:00
gigabit101
b613b1e419
Drills
2016-02-20 23:04:32 +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
0cf477dd89
Some small changes and fixes.
2016-02-20 21:01:14 +00:00
TheDoctorSoda
9126338d60
Rubber
2016-02-20 12:52:06 -08:00
TheDoctorSoda
2d98dab800
Add sap
2016-02-20 12:38:24 -08:00
TheDoctorSoda
dd7b3ef157
Merge pull request #2 from TechReborn/1.8.9
...
Update Fork
2016-02-20 12:18:22 -08:00
modmuss50
c3f85c7347
Fixes #323
2016-02-20 20:07:05 +00:00
