maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2481 commits 1 branch 0 tags 80 MiB
Commit graph

1932 commits

Author SHA1 Message Date
Stuart Pomeroy
77818b609e Fix Grinder GUI 2016-03-26 17:16:09 +00:00
Stuart Pomeroy
a284c45475 Fix Grinder GUI 2016-03-26 17:05:44 +00:00
Stuart Pomeroy
267ac7b8a2 Fixed Grinder GUI and other? 
Just fixed the grinder GUI and stuff.
 2016-03-26 16:59:12 +00:00
gigabit101
4861364cd6 blocks are hard ;) 2016-03-26 16:17:56 +00:00
Stuart Pomeroy
c4345bacae Fix a fuck up. 2016-03-26 16:01:06 +00:00
Stuart Pomeroy
6498bd1974 Update to forge and fuck up the cables? Not sure :P 2016-03-26 15:58:38 +00: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
gigabit101
710f9c04e7 gui fixs 2016-03-23 23:31:40 +00:00
gigabit101
1a580bb1d1 Fixed guis 2016-03-23 21:36:58 +00:00
modmuss50
887708d128 Fixed player detector crash 2016-03-23 20:10:08 +00:00
modmuss50
244ade085d Some small fixes 2016-03-23 20:00:00 +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
4d55b94a0a Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-23 18:08:45 +00:00
modmuss50
d9eded60cc Remove explode sub command 2016-03-23 18:08:29 +00:00
gigabit101
bd37e8ad7f 3D Wrench 2016-03-23 17:05:21 +00:00
modmuss50
f0d6b9e78d Can now place blocks facing up and down 2016-03-23 17:02:21 +00:00
gigabit101
17ff9b2aad some texture fixs 2016-03-23 16:53:32 +00:00
modmuss50
fffcecbb98 Revert "Removed bucket textures as it now generates them at runtime" 
This reverts commit 4585684fe2.
 2016-03-23 11:37:30 +00:00
gigabit101
6d1a8a835e more gui things 2016-03-22 23:58:16 +00:00
gigabit101
123e704caf fixed some machine drops 2016-03-22 23:34:43 +00:00
gigabit101
5ea4dedcb2 Fixed some progress bars 2016-03-22 23:27:35 +00:00
modmuss50
ab19d71ede Moved shields to RebornCore 2016-03-22 20:30:59 +00:00
modmuss50
eec6139d33 Update forge + powernet improvements 2016-03-22 20:03:46 +00:00
modmuss50
1c297634d7 Some fixes?? 2016-03-21 20:37:08 +00:00
modmuss50
0c85662e14 derp, fix compile 2016-03-21 19:46:49 +00:00
modmuss50
aa64b1a8d6 Added more walia support, fix building 2016-03-21 19:45:48 +00:00
modmuss50
4f3d9ddfca Shields 2016-03-21 19:36:54 +00:00
gigabit101
32027f948c Re added waila support for blocks 2016-03-21 16:56:20 +00:00
gigabit101
1acdc13e2d Guis for batbox, mfe, mfsu 2016-03-21 15:52:46 +00:00
gigabit101
8f382f2239 stuff and things 2016-03-21 15:30:32 +00:00
modmuss50
5fde39ebcd Some improvements to things 2016-03-20 21:23:12 +00:00
modmuss50
fee31761b1 Fix NPE 2016-03-20 19:51:41 +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
modmuss50
d8829fd33c Fix some small issues 2016-03-20 16:27:57 +00:00
modmuss50
4a0fd93363 More powernet fixes 2016-03-20 16:23:30 +00:00
modmuss50
14d22e2442 Remove debug message 2016-03-20 16:04:01 +00:00
modmuss50
d8bc90e18c Fixed crash with power net 2016-03-20 15:59:09 +00:00
gigabit101
b34e6df827 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-20 15:52:30 +00:00
gigabit101
11c10601a0 forgot to do this here 2016-03-20 15:47:09 +00:00
Rushmead
af9ed84015 Fixed Cable rendering 2016-03-20 15:44:19 +00:00
gigabit101
24c806d68a Some texture fix's 2016-03-20 15:39:25 +00:00
modmuss50
431c05161a Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-20 15:32:34 +00:00
modmuss50
8f3811c9d8 A load of fixes to the power net, should be better, but needs testing 2016-03-20 15:32:22 +00:00
gigabit101
f3016ed07d Some recipes 2016-03-20 15:28:40 +00:00
modmuss50
5460f2f9a2 Fixed crashes 2016-03-20 12:10:23 +00:00
modmuss50
edc8531b2d Some small power net tweaks, should make some things more stable 2016-03-20 11:10:27 +00:00
modmuss50
232fe0b625 Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-20 11:10:06 +00:00
modmuss50
492917ac95 Improvements to cable rendering. still broken, but not as bad 2016-03-20 10:58:58 +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
471a945de6 Its all broke, mcmultipart support 2016-03-19 18:01:34 +00:00
modmuss50
d5935af4e3 Fixes missing ore texture 2016-03-19 10:10:53 +00:00
modmuss50
2bbc785dde Re-added JEI support, and update things 2016-03-18 08:29:29 +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
04f58c1ebe Added textures to transformers 2016-03-16 17:08:57 +00:00
modmuss50
51539f4ec8 Remove item transformers 2016-03-16 17:04:19 +00:00
modmuss50
ba4517d38c Fix cables not always breaking 2016-03-16 16:59:50 +00:00
modmuss50
5a0f8be435 Added transformers 2016-03-16 16:54:44 +00:00
modmuss50
04edbabdf4 fix compile error 2016-03-16 16:39:40 +00:00
modmuss50
f532ce15c0 Stop nuke's exploding when broken 2016-03-16 16:38:44 +00:00
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
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
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
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
Modmuss50
0c80f2beda More recipes, work on #182 2015-12-16 16:40:47 +00:00
Modmuss50
eedabb9e7d Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 
# Conflicts:
#	src/main/java/techreborn/client/gui/GuiGrinder.java
#	src/main/java/techreborn/tiles/TileGrinder.java
 2015-12-16 16:06:33 +00:00
Modmuss50
96a7b56b5f Fixes #304 2015-12-16 15:56:12 +00:00
Modmuss50
5324016199 fixes #302 2015-12-16 11:07:34 +00:00
Modmuss50
fbc5291a1d Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-14 18:14:12 +00:00
Modmuss50
23255bdfff Fixes #301 2015-12-14 18:13: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
08c0e2d81e Fixes #299 2015-12-14 11:06:25 +00:00
Modmuss50
efd19336bf Revert "Load TechReborn before RebornCore might help with #299" 
This reverts commit a1194698cb.
 2015-12-14 08:31:39 +00:00
Modmuss50
a1194698cb Load TechReborn before RebornCore might help with #299 2015-12-14 08:24:13 +00:00
Modmuss50
abcaccdc82 Added waila support back 2015-12-13 19:41:46 +00:00
modmuss50
3b3deea57b update things 2015-12-13 13:29:15 +00:00
Modmuss50
d64928b4e4 Added more null checks, might fix #297 2015-12-12 11:48:34 +00:00
Modmuss50
d5ce5cba04 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 
# Conflicts:
#	src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
 2015-12-12 11:41:21 +00:00
Modmuss50
cc6dfbc3c4 Fixes #295 2015-12-11 21:52:35 +00:00
Modmuss50
5c95b238fa Fixes #296 2015-12-11 21:33:32 +00:00
Modmuss50
31f1786f6d Updated JEI 2015-12-11 20:07:38 +00:00
Modmuss50
9bb3aad137 Update to new RebornCore 2015-12-11 19:48:16 +00:00
modmuss50
801964a92d Bumped required forge version 2015-12-06 15:02:05 +00:00
modmuss50
f7477f5496 Removed fluid sources from creative tab. 2015-12-06 10:35:37 +00:00
modmuss50
ba90e49822 updated JEI, and improved support 2015-12-05 22:48:11 +00:00
modmuss50
40f78c3938 Merge branch 'master' into 1.8.8 
Conflicts:
	build.gradle
 2015-12-05 20:30:20 +00:00
modmuss50
cf36bc9dc1 Fixes #293 and removed java doc 2015-12-05 20:23:40 +00:00
modmuss50
a795f90971 Update forge, fix ticking tiles. 2015-12-05 20:14:32 +00:00
modmuss50
20af49394f Fluid rendering, no more wasted block states 2015-12-05 19:37:42 +00:00
modmuss50
3fb7dd102b Inital Just Enough Items support 2015-11-29 10:42:34 +00:00
modmuss50
3367e990be Update to new forge and mappings 2015-11-29 09:52:45 +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
94a2229ed7 All block textures now work 2015-11-27 19:54:34 +00:00
Modmuss50
52af3d2d2d Removed null recipes 2015-11-27 13:15:19 +00:00
Modmuss50
285176e171 Large handfull of textures. 2015-11-26 21:48:30 +00:00
Modmuss50
7370784c7f More textures 2015-11-26 20:43:56 +00:00
Modmuss50
869e6d4bf8 Fixed compile errors 2015-11-26 19:33:52 +00:00
Modmuss50
b0784c44d2 Fixes for latest forge and more rendering. 2015-11-26 17:35:31 +00:00
Modmuss50
9f3622ea33 some more texture work 2015-11-25 21:03:55 +00:00
Modmuss50
f12725b4e0 Fixed charge hud, and clocking device. 2015-11-25 08:28:28 +00:00
Modmuss50
d56e6752c0 A lot of stuff looks better now 2015-11-24 22:58:18 +00:00
Modmuss50
0bb1375823 Added cell rendering 2015-11-24 21:39:22 +00:00
Modmuss50
90628fad02 It runs 2015-11-23 20:37:20 +00:00
Modmuss50
bce444a4ff 0 2015-11-23 20:34:05 +00:00
Modmuss50
fe9d41ac76 50 2015-11-23 20:27:06 +00:00
Modmuss50
51d07ac8f5 571 2015-11-23 20:03:07 +00:00
Modmuss50
839647ed85 734 2015-11-23 19:51:40 +00:00
Modmuss50
ef82ceb714 790 2015-11-23 19:37:39 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
b88fe49ee2 1936 2015-11-23 18:41:29 +00:00
Modmuss50
92ca6548c6 2211 2015-11-23 15:15:42 +00:00
Modmuss50
abb9b5102f 2731 2015-11-23 14:49:35 +00:00
Modmuss50
fa9cd98b5a 4693 2015-11-23 14:47:50 +00:00
Modmuss50
011ebaba1d 4862 2015-11-23 14:45:16 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
modmuss50
3db2db3c7c Small fix. 2015-11-22 16:27:15 +00:00
modmuss50
7bcc793d12 Added javaDoc and updated deps 2015-11-22 16:24:50 +00:00
modmuss50
d545521d04 Added PlayerDectector closes #286 2015-11-22 11:16:54 +00:00
modmuss50
05e7ecf2f3 Removed sout lines 2015-11-22 10:33:21 +00:00
modmuss50
48a7f1cc6d Fixes #290 2015-11-22 10:27:33 +00:00
Modmuss50
d928472d84 Fixes #219 2015-11-21 08:54:26 +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
Modmuss50
276bf8355f Computer Cube now shows PDA gui 2015-11-18 19:51:41 +00:00
Modmuss50
806cf757a5 Fixes #264 2015-11-18 19:41:37 +00:00
Modmuss50
0f09088813 Fixes #282 2015-11-18 18:36:00 +00:00
Modmuss50
a47b1b1f27 Fixes #281 2015-11-18 18:35:03 +00:00
Modmuss50
3f41e26ece Fixes some issues with the fustion reactor. 2015-11-18 17:02:22 +00:00
Modmuss50
93d1ff57b7 Fixed in world multiblock preview 2015-11-18 11:10:03 +00:00
Modmuss50
758d918bdb Got the Vacuum Freezer working. 2015-11-18 08:35:34 +00:00
Modmuss50
8fd59c896b Fixes #277 2015-11-18 08:29:51 +00:00
Modmuss50
3114576e7b Most of the Vacuum Freezer(Not working just yet) 2015-11-17 21:48:06 +00:00
Modmuss50
219f2a0df7 Quick Fix for MT Scripts 2015-11-17 18:19:12 +00:00
Modmuss50
96492bd87e Fixes #275 again 2015-11-17 13:31:34 +00:00
Modmuss50
5e079afd05 Small fix to reactor MT support 2015-11-17 11:20:58 +00:00
Modmuss50
9283e46a1f Fixes #275 and added world placement helper for reactor 2015-11-17 11:12:58 +00:00
Modmuss50
8c85aeb4d3 Added minetweaker support for Fusion Reactor 2015-11-17 08:24:41 +00:00
Modmuss50
50a45560ab Fixes #274 and Fixes #268 2015-11-17 07:52:47 +00:00
Modmuss50
3fc8587200 Added info to the gui 2015-11-16 21:51:14 +00:00
Modmuss50
7db2e0dc8c Polish to the reactor 2015-11-16 21:50:09 +00:00
Modmuss50
b506c2e091 Added NEI support for fusion reactor 2015-11-16 21:24:10 +00:00
Modmuss50
a63128aa7e Added Fusion Reactor 2015-11-16 21:10:39 +00:00
Modmuss50
473a981f51 Hot fix 0.6.1 and Fusion Reactor API 2015-11-16 20:27:45 +00:00
Modmuss50
1321422edf Fixes #273 2015-11-16 19:01:27 +00:00
Modmuss50
f42c127201 Added basic fustion reactor multiblock checking. 2015-11-16 15:20:19 +00:00
Modmuss50
100293fb8e Started work on reactor. 2015-11-16 13:36:44 +00:00
Modmuss50
19d269b1de Fixes #271 2015-11-16 11:17:36 +00:00
Modmuss50
78a7bcf4bc Recoded MT support 2015-11-15 20:51:54 +00:00
modmuss50
16f1a8de17 Charge bench recode. 2015-11-13 19:00:17 +00:00
gigabit101
cc2b6a8df3 All machines can now be powered with batteries 2015-11-13 16:40:01 +00:00
gigabit101
0ebf0c95dd more charge slots 2015-11-13 16:29:35 +00:00
gigabit101
a74910e763 Some work on charge slots 2015-11-13 16:08:50 +00:00
Modmuss50
1551164cd6 Some work on recoding MT support 2015-11-13 13:18:48 +00:00
Modmuss50
bb2914bf5d Fix imports 2015-11-13 08:28:32 +00:00
Modmuss50
de1d036b33 Revert "Fixes #219 Potentialy breaking for MT scripts." 
This reverts commit f326dbfec9.
 2015-11-13 08:27:02 +00:00
Modmuss50
a7001bbfd7 Revert "fixes #219 again" 
This reverts commit d562e1222a.
 2015-11-13 08:26:51 +00:00
Modmuss50
2331e3c35d Fixes #255 and fixes #258 2015-11-12 21:38:11 +00:00
Modmuss50
61a600713a Charge bench now supports higher teir items. 2015-11-12 21:28:49 +00:00
gigabit101
c4b50b5c79 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-12 21:01:53 +00:00
gigabit101
da631dd25e Fixed Isidedness of Centrifuge closes #262 2015-11-12 21:01:36 +00:00
Modmuss50
08a3636e72 Fixes #260 2015-11-12 21:00:03 +00:00
gigabit101
a499cf2b09 Removed fake output slot from rolling machine closes #259 2015-11-12 20:50:58 +00:00
gigabit101
322cc072a8 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-12 20:46:44 +00:00
gigabit101
4d6f961b9c Fixed Implosion Compressor gui closes #261 2015-11-12 20:46:37 +00:00
Modmuss50
c0665e5c80 Fixes #257 2015-11-12 20:41:01 +00:00
gigabit101
320d06e39e Fixed Digital Chest not counting the ItemStack in output slot 2015-11-12 20:22:41 +00:00
gigabit101
d9654782fe Fixed stack issue with Quantum/Digital Chest 2015-11-12 20:12:15 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
d562e1222a fixes #219 again 2015-11-12 08:22:47 +00:00
gigabit101
c2dcaf1902 Fixed Quantum Chest/Digital Chest stored items closes #247 2015-11-11 21:37:31 +00:00
Modmuss50
9b6383a548 fixes #251 2015-11-11 18:38:43 +00:00
Modmuss50
25158d872f Removed explosions when raining 2015-11-11 18:33:15 +00:00
Modmuss50
351d7afadb Update reborn core 2015-11-11 17:37:14 +00:00
Modmuss50
85e7bfacde Added ore unifier, disbled by defualt. 2015-11-11 17:25:55 +00:00
Modmuss50
c120c37723 Fixes #250 2015-11-11 17:12:59 +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
8f45d418e3 Fixes crafting for lapotronicOrb 2015-11-11 16:50:28 +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
e4760e559b Fixes #249 2015-11-11 15:30:03 +00:00
Modmuss50
6ab71cb612 Fixed compile error 2015-11-11 15:28:20 +00:00
Modmuss50
47a466ef21 Some fixes for #242 2015-11-11 15:24:13 +00:00
Modmuss50
7135075ac6 Removed power indicator on sawmill 2015-11-11 15:17:24 +00:00
Modmuss50
1618a5ca6d Work for #243 The charge bench has no texture 2015-11-11 13:20:03 +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
f326dbfec9 Fixes #219 Potentialy breaking for MT scripts. 2015-11-11 08:21:21 +00:00
modmuss50
a8bcb76db6 Revert "Now checks that an item in a stack is not null, will throw a NPE if one is found." 
This reverts commit a483d48a2f.
 2015-11-08 19:46:11 +00:00
modmuss50
bde2abe01d Removed scala import 2015-11-08 17:58:07 +00:00
modmuss50
a483d48a2f Now checks that an item in a stack is not null, will throw a NPE if one is found. 2015-11-08 17:45:32 +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
678a44937f Should fix #211 2015-11-07 08:58:26 +00:00
Modmuss50
9d9a1dba60 Fixes #231 2015-11-03 19:42:49 +00:00
Modmuss50
df3142d7ec Disabled asm stripper, test for #229 and #218 2015-11-03 13:22:49 +00:00
Modmuss50
2c56961289 Fixes #226 2015-11-03 11:18:22 +00:00
Modmuss50
269c97497f Cables can now be placed inside existing multiparts 2015-11-02 21:49:41 +00:00
Modmuss50
e3da8073ed Fixes #222 2015-11-02 15:18:10 +00:00
Modmuss50
65d20ec431 Fixes #221 and hides the multiblock when the world is closed. 2015-11-02 15:15:22 +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
Modmuss50
e93b29545e You saw nothing :) 
Just some debug code
 2015-11-01 17:09:46 +00:00
modmuss50
50a830a101 Fixes #207 2015-11-01 16:45:58 +00:00
modmuss50
dedb00aa7e Fixed console spam 2015-11-01 16:31:13 +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
4ab88e0aae Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-01 16:10:46 +00:00
modmuss50
12cfe38a50 Fixes #212 now you need to hold shift to see our info 2015-11-01 16:10:36 +00:00
gigabit101
fcc09445a9 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-01 16:04:52 +00:00
gigabit101
e0c99b8ef7 fixed Quantum tank dropping fluid items when broken closes #210 2015-11-01 16:04:41 +00:00
modmuss50
2f88e819a3 Mulitblock preview now renders behind the block. 2015-11-01 16:04:19 +00:00
modmuss50
b2be570adb Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-01 15:58:44 +00:00
modmuss50
5b57f7f909 Fixes blocks not dropping correctly. 2015-11-01 15:58:34 +00:00
gigabit101
824d7d0e8e Added button to blast furnace gui to show multiblock in world 2015-11-01 15:58:06 +00:00
gigabit101
9dcc36adfe fixed the double click sound when pressing back button 
changed all text colour to white until config is in
 2015-11-01 15:15:44 +00:00
modmuss50
2483dc0c2f Work for #212 2015-11-01 14:43:06 +00:00
modmuss50
227d5fe19b Fixes #214 2015-11-01 14:38:47 +00:00
modmuss50
1342eb90cf Fixes #216 2015-11-01 14:36:44 +00:00
modmuss50
d4607706b8 Fixes #213 2015-11-01 14:33:04 +00:00
modmuss50
8e6de190c0 Fixes #208 2015-10-28 18:50:28 +00:00
modmuss50
dabe79a877 Removed ChatColor and replaced with ChatFormatting 2015-10-25 18:55:49 +00:00
modmuss50
cf34fe1f1f Large improvement to power system, fixes #204 2015-10-25 09:58:57 +00:00
MrBretzel
712eac915b Clean up import 2015-10-25 08:05:45 +01:00
MrBretzel
b8487f5eb5 Fix #196 and mini clean up 2015-10-25 07:34:37 +01:00
modmuss50
6b6bd0bdd0 Some small changes to the multi parts 2015-10-23 16:04:56 +01:00
MrBretzel
2c1950df75 Possible fix for #201 
Possible fix for #201
 2015-10-23 06:32:30 +02:00
modmuss50
95d51a7cb7 fixes #199 and closes #200 2015-10-22 21:23:17 +01:00
modmuss50
50fa2e8a1d Fixes #194 2015-10-22 18:19:05 +01:00
MrBretzel
94b0123a3b Fixed #192 2015-10-22 13:34:11 +02:00
modmuss50
a74154688c Fixes #190 2015-10-17 20:21:43 +01:00
Modmuss50
2d3c6a8dec Charge bench now uses new power system, also uses old one 2015-10-14 21:42:45 +01:00
Modmuss50
9d824e76ca Most of the stuff uses the new item power net now 2015-10-14 21:37:21 +01:00
Modmuss50
531315e55f Move cloaking device to new power system, fix some issues with it. 2015-10-14 21:08:34 +01:00
Modmuss50
2d06d726b4 Started work on rewriting the item power API 2015-10-14 20:57:44 +01:00
Modmuss50
7ae4ec1a98 Clean up of ic2 classic recipes 2015-10-14 13:39:05 +01:00
Modmuss50
652bea5bcd More tweaks based off #189 2015-10-14 13:31:20 +01:00
Modmuss50
cae4aad955 fixes #189 2015-10-14 13:27:43 +01: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
modmuss50
13383bd2a9 Should fix #186 2015-10-10 16:42:21 +01:00
gigabit101
90f0b0ae5b Little work on multiblock page 2015-10-09 23:16:44 +01:00
gigabit101
14b387dd56 closes #180 2015-10-09 22:31:26 +01:00
gigabit101
4a12aaf581 closes #178 2015-10-09 22:23:21 +01:00
gigabit101
891a5f5d19 closes 179 2015-10-09 22:19:38 +01:00
gigabit101
e1db33dd8a Missed one 2015-10-09 22:13:08 +01:00
gigabit101
935a8bc382 Removed more junk 2015-10-09 22:11:04 +01:00
gigabit101
363adeb681 why was this done twice 2015-10-09 22:06:35 +01:00
gigabit101
0f089c79e6 removed un needed ore dict stuff 2015-10-09 22:04:54 +01:00
gigabit101
fd4ecbb6d2 closes #184 2015-10-09 21:59:20 +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
8a494a392c Fixes #172 2015-10-08 08:24:48 +01:00
Modmuss50
75e2bd4733 Machines now explode when they come in contact with rain. 2015-10-07 15:41:26 +01:00
Modmuss50
cb6551c7ca Fixed compile error with last commit 2015-10-07 11:17:09 +01:00