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
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
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
457178842c
Revert "Move IC2 api"
...
This reverts commit ac43b5afc4
2016-02-20 17:06:46 +00:00
modmuss50
ac43b5afc4
Move IC2 api
2016-02-20 17:02:28 +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
4521008c73
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-20 01:08:22 +00:00
gigabit101
464d8cac03
Added advancedCircuit and Circuit
2016-02-20 01:08:18 +00:00
modmuss50
575150edf3
Fix jei log spam
2016-02-20 01:03:37 +00:00
modmuss50
eaf82b68e8
Fix tree rarity
2016-02-20 00:58:04 +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
gigabit101
f8ca41a9ce
Closes #294
2016-02-19 23:33:18 +00:00
modmuss50
6636fc648b
Initial work on rubber trees
2016-02-19 20:58:23 +00:00
modmuss50
c9fad62ed2
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-19 20:32:35 +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
mezz
a1ef232b38
Update JEI, minor clean up of JEI integration
2016-02-17 23:44:15 -08: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
c0ebf03f72
fixes #326
2016-02-16 09:20:26 +00:00
modmuss50
840f524350
Quick fix for #329
2016-02-16 09:11:13 +00:00
The-Fireplace
efccf62690
Update BlockOre.java
...
Conflicts:
src/main/java/techreborn/blocks/BlockOre.java
2016-02-16 09:08:07 +00:00
modmuss50
bf691fd8a6
Fixes #313
2016-02-16 09:07:22 +00:00
modmuss50
99d69f3cbb
Update to new RF API, closes #335
2016-02-10 13:15:02 +00:00
The-Fireplace
0d35ecb70f
Update BlockOre.java
2016-02-06 14:18:47 -06:00
modmuss50
b3bec47b11
Fixes #313
2016-02-06 11:51:55 +00:00
modmuss50
99756b355f
Fixes #328
2016-02-06 11:48:37 +00:00
modmuss50
4585684fe2
Removed bucket textures as it now generates them at runtime
2016-02-02 21:22:51 +00:00
modmuss50
8ec95f9119
Now using new Forge Dynamic buckets, and prep for new update
2016-02-02 21:05:42 +00:00
mezz
e4af69e861
Update JEI & Forge, add recipe click areas and rolling machine transfer
2016-02-01 17:59:23 -08:00
modmuss50
c2562ac7b3
Update JSONDestroyer
2016-02-01 15:06:14 +00:00
modmuss50
3909a868aa
Revert "Revert "Fix bucket issues""
...
This reverts commit d5b880387a
2016-01-22 17:41:47 +00:00
modmuss50
f7ccd07b1a
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
...
# Conflicts:
# src/main/java/techreborn/items/tools/ItemFluidbucket.java
2016-01-22 13:40:47 +00:00
modmuss50
7e7ad74203
Squashed commit of the following:
...
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date: Fri Jan 22 13:38:27 2016 +0000
Rename to fix spelling issue
commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date: Fri Jan 22 13:27:15 2016 +0000
Update to new JSON-Destoryer version
commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date: Wed Jan 20 17:27:41 2016 +0000
Update to new json destroyer
2016-01-22 13:39:20 +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
006b611fa3
Fix another merge error
2016-01-16 13:16:55 +00:00
modmuss50
415531587b
Fix incorrect merge
2016-01-16 13:11:08 +00:00
modmuss50
2a617919d9
Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
...
# Conflicts:
# src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
# src/main/java/techreborn/tiles/TileBlastFurnace.java
2016-01-16 13:09:09 +00:00
modmuss50
b7023f3114
Merge remote-tracking branch 'remotes/origin/master' into 1.7.10
2016-01-16 13:06:43 +00:00
gigabit101
77bfbc46f8
closes #311
2016-01-16 04:32:58 +00:00
gigabit101
1ed3d226f2
Closes #320
2016-01-16 04:27:17 +00:00
modmuss50
692c89a6a0
Fixes #327
2016-01-13 17:17:53 +00:00
modmuss50
eca3534d1e
fixes #324
2016-01-13 15:41:30 +00:00
modmuss50
7139a62102
Update to fixed Reborn core and bump version
2016-01-13 13:40:02 +00:00
modmuss50
2b54516bdd
Fixes #321 - And I tested it so I know it works
2016-01-09 11:41:16 +00:00
modmuss50
be2f5f9e52
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-01-07 10:46:33 +00:00
modmuss50
b588e8c08a
IC2 Classic API support (This is all you are getting)
...
If this is broken I dont care, if it has broken other things I will care.
2016-01-07 10:46:13 +00:00
mezz
a00543c67d
Update to latest JEI
2016-01-06 00:46:23 -08:00
modmuss50
ee86b97429
Fixed issue with RF not working as expected
2016-01-05 18:12:13 +00:00
modmuss50
7ecdd27752
Start work on porting from the MT script
2016-01-03 19:07:31 +00:00
modmuss50
b242ec5c5f
Cut all the things!
2016-01-02 01:40:11 +00:00
modmuss50
7e12e3acbf
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-01-01 20:36:12 +00:00
modmuss50
cf800a905b
Fixes #309 and might help #314
2016-01-01 20:35:58 +00:00
mezz
686dd71caf
Add rolling machine recipes
2015-12-31 03:20:04 -08:00
mezz
090de63608
Add Vacuum Freezer recipes
2015-12-31 02:27:07 -08:00
mezz
ad0b45cd2a
Add industrial sawmill recipes
2015-12-31 02:11:24 -08:00
mezz
123042a069
Refactor setting recipe items for JEI
2015-12-31 02:10:57 -08:00
mezz
3fde850448
Add Industrial Electrolyzer recipes
2015-12-31 01:40:56 -08:00
mezz
ef1ee67c06
Change blast furnace recipe in JEI to crop out the power icon
2015-12-31 01:26:26 -08:00
mezz
6ce72c8339
Fix oreDict support for recipes in JEI
2015-12-31 01:25:54 -08:00
mezz
aed7b5c0c4
Add implosion compressor recipes
2015-12-31 01:07:35 -08:00
mezz
5addee32e6
Add grinder recipes
2015-12-31 00:56:09 -08:00
mezz
c187f931ce
Add chemical reactor recipes
2015-12-30 23:30:09 -08:00
mezz
bb82e2cfb2
Add centrifuge recipes
2015-12-30 23:13:02 -08:00
mezz
ff571d5444
Add blast furnace recipes
2015-12-30 22:28:58 -08:00
mezz
05d8a5c787
Add assembling machine recipes
2015-12-30 22:28:39 -08:00
mezz
4b804c3521
Add alloy furnace recipes
2015-12-30 21:17:20 -08:00
mezz
202555b4ac
Add RecipeTransferHandler for FusionReactor
2015-12-30 20:20:36 -08:00
mezz
181498e132
Clean up JEI Integration
2015-12-30 20:09:06 -08:00
modmuss50
1c28fa6e0a
Revert "Disable BOP support to try and fix gradle crash"
...
This reverts commit 13f3d5757f
2015-12-30 23:57:06 +00:00
modmuss50
c791bcdeb5
update to new RebornCore
2015-12-30 23:25:36 +00:00
modmuss50
13f3d5757f
Disable BOP support to try and fix gradle crash
2015-12-30 17:17:16 +00:00
modmuss50
54817286e6
Revert "test to fix build issue"
...
This reverts commit eed1a7a719
2015-12-30 17:09:17 +00:00
modmuss50
0c7f07001b
temp remove jei support to track down build issue.
2015-12-30 17:06:24 +00:00
modmuss50
895d5cfdd9
1.8.9 update
2015-12-30 11:57:06 +00:00
modmuss50
d973d6b108
Added back some more compat
2015-12-28 10:57:22 +00:00
modmuss50
df213bc22a
Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8
2015-12-23 12:43:53 +00:00
modmuss50
2320ceb2c3
Fixed machines loosing state
2015-12-23 12:40:48 +00:00
Modmuss50
13d3d475fd
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
2015-12-18 19:39:43 +00:00
modmuss50
5821dbfe0e
Added config to CompatManager to allow disabling of handlers.
2015-12-18 19:17:11 +00:00
Modmuss50
f17cd36815
Update merged commits to 1.8.8
2015-12-16 17:13:17 +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
741c25a5a2
Standalone recipes!
2015-12-16 17:04:37 +00:00
