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
TheDoctorSoda
c4a00c8152
[TEXTURES] LV, MV, and HV transformers.
2016-03-15 11:03:26 -07:00
modmuss50
e0547cecff
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
2016-03-15 08:07:06 +00:00
modmuss50
5b183ac231
Fix fence rendering
2016-03-15 07:50:12 +00:00
TheDoctorSoda
e90592403b
Added Scrapboxinator, reverted yellow energy outlines, added grinder textures
2016-03-14 21:53:05 -07:00
TheDoctorSoda
5c07626959
[TEXTURES] Yellow "energyslots"
2016-03-14 13:39:40 -07:00
TheDoctorSoda
3a206ce9f8
[TEXTURES] Made GUIs more user-friendly
2016-03-14 13:34:46 -07:00
TheDoctorSoda
7496777169
[TEXTURES] Change AESU, IDSU, and LESU gui
2016-03-14 12:23:07 -07:00
TheDoctorSoda
427d5e7f2c
[TEXTURES] AESU, IDSU, and LESU
2016-03-14 12:16:11 -07:00
TheDoctorSoda
2a2a0283d8
[TEXTURES] MFE and MFSU
2016-03-14 11:22:24 -07:00
TheDoctorSoda
d66315ae2c
Some guis
2016-03-14 01:03:46 -07:00
TheDoctorSoda
801b497d86
Update some texture paths, fix ore harvestibility, and fix ore recipes
2016-03-13 22:25:06 -07:00
TheDoctorSoda
72b2f01b9a
[TEXTURES] Batbox
2016-03-13 21:12:04 -07:00
TheDoctorSoda
b0fa75a3bd
Fixed some things I forgot in last commit
2016-03-13 21:11:22 -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
TheDoctorSoda
d8e06e81bb
[TEXTURES] accidently pushed WIP auto input texture
2016-03-13 12:09:18 -07:00
TheDoctorSoda
692620618c
[TEXTURES] Some textures
2016-03-13 12:07:46 -07:00
TheDoctorSoda
389ec27129
[TEXTURES] bronze tools and armour item textures
2016-03-08 19:35:04 -08:00
TheDoctorSoda
f2224beb99
[TEXTURES] Recycler front
2016-03-08 18:14:42 -08:00
TheDoctorSoda
618088feaf
[TEXTURES] Alloy furnace retexture
2016-03-08 17:58:41 -08:00
TheDoctorSoda
02dd024e83
Scrapboxes work in dispensers (w/ config option)
2016-03-08 00:15:34 -08:00
TheDoctorSoda
c5302f8d6b
Add description page to JEI on how to obtain sap
2016-03-07 23:15:53 -08:00
TheDoctorSoda
5f77e1b16f
Iron furnace burning particles & [TEXTURES] Iron Furnace textures
2016-03-07 22:33:13 -08:00
TheDoctorSoda
29c43ddd99
Fix thermal generator texture and adjust nanosaber speed
2016-03-07 20:47:40 -08:00
TheDoctorSoda
b0fda3c4da
[TEXTURES] Animated generator and added reinforcedglass
2016-03-07 20:39:29 -08:00
modmuss50
a9fed5d933
Middle click cables, calmed the nanosaber down.
2016-03-07 17:25:03 +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
6822bf4101
[TEXTURES] Lapotron and Energy crystals
2016-03-06 22:43:37 -08:00
TheDoctorSoda
a379360ef5
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 18:37:25 -08:00
TheDoctorSoda
c19b792960
[TEXTURES] Cables and refined iron
2016-03-06 18:37:10 -08:00
gigabit101
fa5c568adf
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 23:15:33 +00:00
gigabit101
02ac62a180
Started Recycler
2016-03-06 23:15:28 +00:00
TheDoctorSoda
fcd594e512
[TEXTURES] Cable block textures
2016-03-06 14:27:21 -08:00
TheDoctorSoda
b7e918a175
[TEXTURES] The rest of the cable item textures
2016-03-06 14:00:19 -08:00
TheDoctorSoda
d6dd706f9c
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 13:52:26 -08:00
TheDoctorSoda
d4d7d2c257
Nanosaber textures
2016-03-06 13:51:49 -08:00
modmuss50
57f91f3159
Cables now shock the entity's
2016-03-06 21:42:27 +00:00
gigabit101
90f5d77a41
Finish on Iron furnace
...
Added Jei support to Iron Furnace
2016-03-06 19:59:39 +00:00
gigabit101
a9ad808dcb
Added missing localization
2016-03-05 23:00:12 +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
TheDoctorSoda
3c3591cec2
Treetap recipe and [TEXTURES] uu matter change
2016-03-02 17:16:35 -08:00
TheDoctorSoda
c5cfa0890d
[TEXTURES] Massive storage block, plate, and ingot overhaul
2016-02-29 00:19:49 -08: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
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
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
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
19e66c1c93
More work on the new manual
2016-02-26 12:56:15 +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
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
modmuss50
efbf4c59bb
Added a load of new parts
2016-02-25 18:37:29 +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
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
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
TheDoctorSoda
6d319c0694
Neutron Reflectors
2016-02-22 15:54:01 -08: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
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
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
c06a98422d
Added scrap item, utilise some new textures.
2016-02-21 13:49:49 +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
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
1f59226e01
Add some stuff, that does things
2016-02-20 19:46:18 +00:00
TheDoctorSoda
fe216fba03
Merge pull request #1 from TechReborn/1.8.9
...
Pull stuff
2016-02-20 10:42:44 -08:00
modmuss50
0ac86ff303
Added sapling
2016-02-20 18:40:35 +00:00
TheDoctorSoda
d3c3f3edcf
Might've fixed tiling issue w/ rubber
2016-02-20 10:39:32 -08:00
TheDoctorSoda
44a60d984a
Rubber sapling
2016-02-20 10:29:03 -08:00
TheDoctorSoda
765475bee7
Changed rubber textures
2016-02-20 09:58:03 -08: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
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
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
c0ebf03f72
fixes #326
2016-02-16 09:20:26 +00:00
modmuss50
4585684fe2
Removed bucket textures as it now generates them at runtime
2016-02-02 21:22:51 +00:00
mezz
4b804c3521
Add alloy furnace recipes
2015-12-30 21:17:20 -08:00
mezz
181498e132
Clean up JEI Integration
2015-12-30 20:09:06 -08:00
modmuss50
0d4b9afd01
All Items now have textures
2015-11-27 20:17:12 +00:00
Modmuss50
285176e171
Large handfull of textures.
2015-11-26 21:48:30 +00:00
Modmuss50
2c31b9211c
Started work on the player detector.
2015-11-18 20:59:08 +00:00
Modmuss50
08cbe33f00
Fixes #263
2015-11-18 20:14:46 +00:00
Mazdallier
6efa1de164
Update fr_FR.lang
...
all done
2015-11-17 10:22:27 +01:00
Modmuss50
f42c127201
Added basic fustion reactor multiblock checking.
2015-11-16 15:20:19 +00:00
Mazdallier
81b45789ac
Update fr_FR.lang
...
big update to continuous line 695
2015-11-16 15:40:43 +01:00
Modmuss50
100293fb8e
Started work on reactor.
2015-11-16 13:36:44 +00:00
Modmuss50
9b1378a64c
Fixes #269
2015-11-15 21:12:31 +00:00
Modmuss50
df5bd1422a
Fixes #267
2015-11-15 20:54:31 +00:00
gigabit101
421597fbab
Added missing localizations closes #242
2015-11-13 16:48:51 +00:00
gigabit101
0ebf0c95dd
more charge slots
2015-11-13 16:29:35 +00:00
Modmuss50
08a3636e72
Fixes #260
2015-11-12 21:00:03 +00:00
Modmuss50
5419067213
Work for #242
2015-11-12 08:32:14 +00:00
Modmuss50
842fa421ae
Fixes #243
2015-11-11 17:00:18 +00:00
Modmuss50
47a466ef21
Some fixes for #242
2015-11-11 15:24:13 +00:00
Modmuss50
701c658323
Fixes all of #242
2015-11-11 13:17:14 +00:00
MrBretzel
1307406e10
Adding iron alloy smelter to not enough items and fix ChargedHud possible crash
2015-11-01 23:10:32 +01:00
gigabit101
57b85450e6
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-11-01 16:55:02 +00:00
gigabit101
206d09ed31
Added a bunch more localization
2015-11-01 16:54:58 +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
MrBretzel
28b0a5da8c
Move to png
...
Fix bug
2015-10-25 08:14:08 +01:00
MrBretzel
67398ca163
Move to jpeg
...
just a bug...
2015-10-25 08:13:38 +01:00
modmuss50
81c498086a
closes #176
2015-10-10 16:51:56 +01:00
gigabit101
a8ea0f55e7
Removed a load of un needed junk from other versions of Gtech
2015-10-09 21:55:54 +01:00
gigabit101
5a230b20a2
Fix's #185
2015-10-09 21:10:20 +01:00
Modmuss50
caca45d86b
Removed Iron Gear Texture
2015-10-07 16:09:14 +01:00
Modmuss50
75e2bd4733
Machines now explode when they come in contact with rain.
2015-10-07 15:41:26 +01:00
modmuss50
c30633b5d3
Added config for disabling connected textures
2015-10-02 21:09:57 +01:00
modmuss50
219570f288
Added connected textures to reinforced casing
2015-09-26 16:21:50 +01:00