TheDoctorSoda
bb16153e77
Fix MFE and MFSU paths
2016-03-14 11:25:12 -07:00
modmuss50
54c7827bb2
Fixes subitem rendering
2016-03-14 13:28:33 +00: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
7a121be651
Some small fixes
2016-03-13 16:57:10 +00:00
modmuss50
b4a16c03ed
And 50 more errors fixed
2016-03-13 16:15:27 +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
3a99ebcf02
Explosion command
2016-03-12 15:43:32 +00:00
modmuss50
dc1ff4754c
Retro gen, enable in ores.json config file, disable once ran
2016-03-12 11:47:05 +00:00
modmuss50
3d082d8b82
Removed unused config properties
2016-03-11 20:28:01 +00:00
modmuss50
28dda59ed5
Rewritten world generation, new ores.json config file
2016-03-11 20:24:05 +00:00
modmuss50
8ab9ecd28e
More work on the new ore config, please leave feedback
2016-03-11 13:31:42 +00:00
modmuss50
82043cadc4
Move config files into own dir
2016-03-11 13:09:59 +00:00
modmuss50
ee05dd5cb5
Initial draft on new ore config file
2016-03-11 11:21:14 +00:00
modmuss50
62fb79a6b0
Added world clear command to test ores
2016-03-11 11:01:51 +00:00
modmuss50
a23286d0e7
Fixes #374
2016-03-10 21:48:07 +00:00
gigabit101
4516b9023f
Nanosaber on/off state is now NBT
2016-03-09 15:03:26 +00:00
gigabit101
a938a1ab4d
Thermal gen now shows stored power in gui
2016-03-09 15:03:09 +00:00
gigabit101
d069bf77e3
closes #377
2016-03-09 13:59:38 +00:00
gigabit101
e1cd18ad7d
closes #376
2016-03-09 13:46:08 +00:00
modmuss50
9ac1db6dc1
Fixes #375
2016-03-09 08:35:06 +00:00
modmuss50
6765756e2d
Some more fixes to the energy net
2016-03-08 18:55:40 +00:00
modmuss50
7e5e40a338
Added machine teirs (can someone check them)
...
Fixed crash when machines explode
2016-03-08 17:34:04 +00:00
modmuss50
0de43bfe2d
Initial work on machine explosions, I will need to update the API to allow finer control over what explodes
2016-03-08 13:20:14 +00:00
modmuss50
58b202a782
Fixes transparency on glass
2016-03-08 08:33:38 +00: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
2221a303ad
Move thermal generator TE to proper package
2016-03-07 21:56:37 -08:00
TheDoctorSoda
60ae28ad49
Uninsulated cable Sound/Particle/Damage configs
2016-03-07 21:46:29 -08:00
TheDoctorSoda
29c43ddd99
Fix thermal generator texture and adjust nanosaber speed
2016-03-07 20:47:40 -08:00
modmuss50
f966cdb632
Power net is working (just)
2016-03-07 21:45:06 +00:00
modmuss50
67526480ad
Added walia support for the cables
2016-03-07 20:33:08 +00:00
modmuss50
cebef75338
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-07 19:06:11 +00:00
modmuss50
10c593e3c1
Initial work on new power network
2016-03-07 19:05:56 +00:00
gigabit101
516e64792c
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-07 17:26:15 +00:00
gigabit101
626cbbbbc7
derp
2016-03-07 17:26:04 +00:00
modmuss50
a9fed5d933
Middle click cables, calmed the nanosaber down.
2016-03-07 17:25:03 +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
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
77e2edc005
More work on recycler
2016-03-07 00:21:22 +00: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
modmuss50
57f91f3159
Cables now shock the entity's
2016-03-06 21:42:27 +00:00
gigabit101
e6c510bbea
Fixed machines returning wrong itemstack when wrenched
2016-03-06 21:03:20 +00:00
gigabit101
059b197d5c
More recipe tweaks
2016-03-06 21:00:42 +00:00
gigabit101
5f1d059058
Added logic to Electric furnace
2016-03-06 20:39:31 +00:00
gigabit101
d02424070d
Recipe tweak
2016-03-06 20:22:43 +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
a84075ff69
Nerfed generator and fix generator gui
2016-03-06 15:42:12 +00:00
gigabit101
b7212bec69
Fixed generator not storing inv
2016-03-06 15:20:38 +00:00
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
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
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
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
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
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
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
b68647ffa0
[TEXTURES] Manual update
2016-02-25 19:32:33 -08:00
TheDoctorSoda
2f03b20bea
Fix chainsaws extending Pickaxe not Axe
2016-02-25 19:01:02 -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
modmuss50
56b1619ca6
Register some more replacement blocks/items
2016-02-23 08:38:32 +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
502fae9518
Fix rubber sapling texture
2016-02-21 18:42:36 -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
571e1aa033
Fix iron shovel mining speed for drill
2016-02-21 15:02:05 -08:00
TheDoctorSoda
1a9c2fd3d5
Drill textures
2016-02-21 14:18:25 -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
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
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
modmuss50
0ac86ff303
Added sapling
2016-02-20 18:40:35 +00: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
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
.
# Conflicts:
# src/main/java/techreborn/items/tools/ItemFluidbucket.java
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