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

1486 commits

Author SHA1 Message Date
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