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

1965 commits

Author SHA1 Message Date
modmuss50
8fb186c39f Merge remote-tracking branch 'remotes/origin/1.9' into 1.9.4 2016-05-18 20:20:33 +01:00
modmuss50
3509ff4f10 Clean up Ore Dic Registry, should fix INV Tweaks crash 2016-05-18 20:14:50 +01:00
modmuss50
83e2cd1310 Update forge 2016-05-18 19:19:22 +01:00
modmuss50
caa05a26a0 Beta release 2016-05-18 17:40:52 +01:00
modmuss50
fcae1a54d7 Use 1.9.4, update mc multipart 2016-05-18 17:06:05 +01:00
modmuss50
8f3352238f Workaround a forge bug, REVERT WHEN FIXED 2016-05-18 17:00:42 +01:00
modmuss50
74d500a2fd Update to minecraft version 1.9.4 2016-05-18 16:53:54 +01:00
modmuss50
7d95dea783 Update Item Registry 2016-05-17 21:39:07 +01:00
modmuss50
e38c800f21 Added Universal Cell 2016-05-17 21:12:33 +01:00
modmuss50
9035f2a21c Merge branch '1.9' into 1.9-BTM 2016-05-17 19:55:57 +01:00
modmuss50
90c7ab09ec Fixes #587 2016-05-17 18:41:09 +01:00
modmuss50
7e2db4a715 Rewrote fluids 
Now uses json files
Now uses forge bucket
Now not broken, closes #557
 2016-05-17 18:36:51 +01:00
modmuss50
c20c6d4722 Fixes #496 and update Json-Destoyer 2016-05-17 11:41:37 +01:00
modmuss50
0ac27fd90e Fixes #585 2016-05-17 10:35:00 +01:00
modmuss50
aaeb67f9c4 Fixes #583 2016-05-17 10:28:06 +01:00
modmuss50
2e4943cf85 Improve cable rendering test.png 2016-05-16 17:07:38 +01:00
modmuss50
4a1226322e Merge branch '1.9' into 1.9-BTM 2016-05-16 16:21:33 +01:00
modmuss50
68b77fca0a Version 1.1.1 2016-05-16 16:09:28 +01:00
modmuss50
89d9dc99e2 Fixes #381 rubber ore dic issue 2016-05-16 16:04:31 +01:00
modmuss50
4c5cf82db4 Rewrite ores 2016-05-16 15:48:48 +01:00
modmuss50
3fb1e4ceb8 Some improvements to cable rendering 2016-05-16 15:09:59 +01:00
modmuss50
2df4688887 Fixes #578 2016-05-16 14:30:32 +01:00
modmuss50
5a454c2e8b Fixes #579 2016-05-16 14:29:02 +01:00
Prospector
3cf950d491 Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes. 2016-05-15 21:24:35 -07:00
Prospector
58037e3c9c Removed In/Output markers on GUIs 2016-05-15 16:55:38 -07:00
Prospector
4a05018849 Fix rockcutter 2016-05-15 15:03:13 -07:00
modmuss50
61bf289f43 Complete Distributor 2016-05-15 09:53:38 +01:00
modmuss50
3eb4eec55a Merge branch '1.9' into 1.9-BTM 2016-05-15 09:39:05 +01:00
modmuss50
6d34d072af Some small fixes the PDA 2016-05-15 09:35:31 +01:00
Prospector
2410b4852f remove hot tungstensteel plate...who needs a hot plate anyway? 2016-05-14 22:54:18 -07:00
Prospector
36d736686b Fix TRArmour texture caps 2016-05-14 14:58:09 -07:00
modmuss50
a170177980 Some more work 2016-05-14 19:26:04 +01:00
modmuss50
cc921dca0a Re-enabled shield hud rendering 2016-05-14 19:08:22 +01:00
modmuss50
a2063df069 added basic block 2016-05-14 18:53:07 +01:00
modmuss50
3dd6ca4697 Fix small dust textures 2016-05-13 11:07:56 +01:00
modmuss50
0dbae6a781 Fixes 3d person nano saber rendering 2016-05-13 08:35:02 +01:00
modmuss50
960bac8cc2 Fix Server Crash 2016-05-13 07:46:17 +01:00
modmuss50
6ef2285ab6 Fix Server Crash 2016-05-13 07:35:21 +01:00
modmuss50
560147e3b5 Fixed some issues with saving the parts, and broke the movement even more 2016-05-12 21:37:24 +01:00
modmuss50
b0fbd5aea0 Update to support removal of ic2 api 2016-05-12 19:16:40 +01:00
modmuss50
9ecd52436b Improve fluid propagation, still some issues 2016-05-12 18:41:51 +01:00
Prospector
934cc76089 Frequency Transmitters only stack to 1 2016-05-11 22:37:55 -07:00
Prospector
2f370d5637 Fix localizations and improve chat messages 2016-05-11 18:44:28 -07:00
modmuss50
19adfe5d58 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-05-11 11:17:25 +01:00
modmuss50
7808400028 Fix z-flighting and fluid movement, uv's still need a look at 2016-05-11 11:17:17 +01:00
Prospector
f746df428b Frequency Transmitter works now 2016-05-10 22:35:09 -07:00
modmuss50
37dc52d6df Fluid moves, you just loose 1/2 of it 2016-05-10 21:45:54 +01:00
modmuss50
25280e9e7e Small improvements to cable rendering 2016-05-10 13:10:27 +01:00
modmuss50
5ca379667d fix building 2016-05-10 07:45:13 +01:00
Prospector
1bcc459865 Make pipes look fancier 2016-05-09 17:38:41 -07:00
modmuss50
6488a9227e Started work on fluid movement mechanic 2016-05-09 21:37:07 +01:00
modmuss50
a78b2b6745 Bump the windmill eu output 2016-05-09 21:24:37 +01:00
modmuss50
4cd4e4109b Speed improvement 2016-05-09 18:33:01 +01:00
modmuss50
62fd8f53f6 Added fluid pipe types 2016-05-09 17:27:22 +01:00
modmuss50
fd95cf7141 Some more work on fluid pipe rendering, I may recode it 2016-05-09 16:33:36 +01:00
modmuss50
9fa77d31d8 Fix forge fluid bucket rendering 2016-05-09 16:18:22 +01:00
modmuss50
13d70e1b95 Remove old 1.7 connected texture stuff 2016-05-09 11:15:08 +01:00
modmuss50
dd6e69bea5 Start work on fluid pipes 2016-05-09 11:13:52 +01:00
Prospector
b97e884432 Tinkers' Construct Support 
Closes #368
 2016-05-08 18:02:11 -07:00
modmuss50
45e31c1aef Added pump 2016-05-08 21:42:09 +01:00
modmuss50
58371903d3 Fix major gig derp 2016-05-08 21:11:17 +01:00
Prospector
a6cfd90339 get tinkers in the dev env (no compat yet) 2016-05-08 10:26:40 -07:00
modmuss50
caaa5a3e7f Fix sounds 2016-05-08 11:42:59 +01:00
modmuss50
9c6e9aef64 Update to new forge registry system 2016-05-08 10:13:21 +01:00
modmuss50
c9f84375ac Fixes #549 gui still needs syncing 2016-05-08 10:00:06 +01:00
modmuss50
4c6c88d950 Comment out psi support and remove jar 2016-05-08 09:53:48 +01:00
modmuss50
063558bf71 fixes #555 2016-05-08 09:52:30 +01:00
modmuss50
e71953dc2a Fixes #556 and fixes #550 2016-05-08 09:34:52 +01:00
modmuss50
140b03960e Fixes #557 2016-05-08 09:24:16 +01:00
Prospector
2a367085e1 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-05-07 13:34:00 -07:00
Prospector
2b84fceef3 Remove vinteum dust 2016-05-07 13:33:14 -07:00
modmuss50
a060c33e5a Fixes #522 2016-05-07 13:45:33 +01:00
modmuss50
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
modmuss50
595c9575b1 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-05-06 19:49:32 +01:00
Prospector
5ee2bdedf2 Re-register scrapbox category/handler cause I'm a derp 2016-04-30 20:11:20 -07:00
Prospector
44f2588b4e Update JEI compat 2016-04-30 20:01:10 -07:00
Prospector
994d12a850 Remove lots of useless stuff (will break existing worlds) 2016-04-29 21:21:28 -07:00
modmuss50
ca73a31efa Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-04-27 17:20:36 +01:00
modmuss50
5773bf66d0 Added offhand stack power hub rendering 2016-04-27 17:19:06 +01:00
Prospector
ab1a2910dd Get rid of scrapbox code in freq. transmitter :P 2016-04-25 07:00:31 -07:00
modmuss50
eca6144c66 Now with 50% less json file, and fixes 2016-04-25 11:10:06 +01:00
modmuss50
61c7815f3b Initial json's for machines, gui blocks are broken 2016-04-24 21:49:22 +01:00
modmuss50
b55c0a3c8e Revert ItemParts.java, fix issue with ManualLoader 2016-04-24 21:07:56 +01:00
Prospector
d1ca1eaa74 Remove some crap 2016-04-24 10:57:44 -07:00
Prospector
3e99b11291 Fix build 2016-04-24 10:19:16 -07:00
modmuss50
f33f98690d Start work on json exporter 2016-04-24 17:24:30 +01:00
Prospector
5e423da58c Disable psi support for now 2016-04-24 08:33:20 -07:00
modmuss50
e4588c6b52
Fix compile 2016-04-23 21:46:59 +01:00
modmuss50
d8b6cb6351
Added psi build 2016-04-23 21:46:30 +01:00
Prospector
3efacbcd6b Psi compat code. Broken and will break build. Have fun :P 2016-04-23 13:18:04 -07:00
Prospector
ab51699e5a Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-04-23 13:11:35 -07:00
Prospector
c3f79d6c6f Update Forge 2016-04-23 13:11:30 -07:00
modmuss50
9561b36661
Now downloads the zip file 2016-04-23 13:52:50 +01:00
modmuss50
a2d626bc61
Fixes #523 2016-04-23 13:32:03 +01:00
modmuss50
b2d5ee7b3d
Fixes #530 2016-04-23 13:23:11 +01:00
modmuss50
e7f9c679df
Update forge and deps 2016-04-23 13:05:39 +01:00
Prospector
0d52c4515e Fix builds 2016-04-21 20:51:15 -07:00
modmuss50
c66565a90f
Fixes cable rendering, closes #512 2016-04-19 08:26:37 +01:00
modmuss50
e62bcc215e
moved designer to its own repo 2016-04-17 11:48:01 +01:00
modmuss50
a5cd7e38df
fixes crash when running exporter on headless server 2016-04-17 11:29:59 +01:00
modmuss50
8de90e6209
added exporter 2016-04-16 20:28:11 +01:00
modmuss50
55739cdb98
added image support for designer 2016-04-16 13:41:52 +01:00
modmuss50
70f458d089
Added designer jar 2016-04-16 09:02:33 +01:00
modmuss50
3abfc3cb13
Ore config now uses HJSon, its easier for humans to read and I have included a converter 2016-04-16 08:58:17 +01:00
modmuss50
cdee0ddc06
Debof jar now runs the designer, this might change 2016-04-15 21:54:43 +01:00
modmuss50
b06d89cf93
fixes #522 2016-04-14 07:53:29 +01:00
modmuss50
e01a8ed4c1
Bump version 2016-04-13 17:14:19 +01:00
modmuss50
912eced5e5 Move assemblingmachine and centrifuge to the new system 2016-04-13 16:25:51 +01:00
modmuss50
8c49a27b76 allow AmbientOcclusion on cables 2016-04-13 16:13:03 +01:00
modmuss50
b822cee9fb Update walia, add MT and CT support back, Fix #519, update for new RC bucket thing 2016-04-13 13:47:02 +01:00
modmuss50
4fccaa1f5f Update AlloySmelter to new system 2016-04-12 08:39:50 +01:00
modmuss50
23d55e6251 Work on the new container stuff 2016-04-12 08:33:38 +01:00
modmuss50
98d459735f Implement IRecipeCrafterProvider on all tiles that need it 2016-04-11 17:50:00 +01:00
modmuss50
dded3c685a Massive tile clean up, I might have broken something somewhere 2016-04-11 17:43:54 +01:00
modmuss50
ef133ab25b Start on tile rewrite 2016-04-11 17:23:57 +01:00
gigabit101
169c8e5ceb Fixed copper and tin ore ore dict issues 2016-04-10 22:50:05 +01:00
gigabit101
316375ee3a Fixed copper not being oredict 2016-04-10 14:35:28 +01:00
modmuss50
d43c4c5d20
Fixes #513 2016-04-09 16:42:54 +01:00
modmuss50
ed5effb888
Even more work on the designer, last commit before I break everying 2016-04-09 16:29:48 +01:00
modmuss50
77102819a4
A lot of work on the wiki designer 2016-04-08 15:19:10 +01:00
modmuss50
bc7b5b2566
Fixes #511 2016-04-08 14:24:53 +01:00
modmuss50
df651e7016 Some improvements to the designer 2016-04-07 15:57:20 +01:00
modmuss50
9e107c849f Initial work on the new in game wiki 2016-04-05 20:09:07 +01:00
modmuss50
4f01850616 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-04-04 23:06:58 +01:00
modmuss50
3c5e2b335a Fixes #497 2016-04-04 23:06:49 +01:00
Prospector
3b94b09194 Add Transformer configs 
Closes #501
 2016-04-03 15:20:35 -07:00
modmuss50
510f969c94 Auto remove un needed things in the code 2016-04-03 14:34:39 +01:00
modmuss50
7e7fcf2ad9 Made the api usefull 2016-04-03 14:25:46 +01:00
modmuss50
b44cdd4064 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-04-03 14:07:55 +01:00
modmuss50
df61729d6f Some work on the new api 2016-04-03 14:07:45 +01:00
Prospector
8b7067732a New circuit textures 2016-04-03 00:35:46 -07:00
modmuss50
3d819967be Fixes #444 2016-04-01 20:22:55 +01:00
modmuss50
be2a3f4006 Fixes #469 2016-04-01 20:13:50 +01:00
modmuss50
a9d814e777 Fixes #480 2016-04-01 20:10:32 +01:00
modmuss50
a37693b8da Fixes #479 2016-04-01 20:08:40 +01:00
modmuss50
58b5472987 Fixes #482 2016-04-01 20:06:33 +01:00
modmuss50
477a60e8de fixes #490 2016-04-01 19:40:08 +01:00
modmuss50
04f0736568 Fixes #465 2016-04-01 19:35:27 +01:00
gigabit101
7369288829 nothing to see here 2016-04-01 17:16:34 +01:00
gigabit101
d61032cb07 closes #488 2016-04-01 13:11:06 +01:00
gigabit101
45174e40ec closes #477 2016-04-01 13:06:49 +01:00
gigabit101
b035e87bc9 closes #491 2016-04-01 13:02:58 +01:00
Prospector
77104b39ce Recipe changes and DOGECOIN 2016-03-29 22:45:15 -07:00
Prospector
88fbcb1aaf Fix lightning rod texture 2016-03-29 19:01:21 -07:00
Prospector
4af72aed00 Fix Transformer Upgrade Recipe 2016-03-29 17:43:35 -07:00
Stuart Pomeroy
02357ce1a4 Fix Tiles and Guis, closes #478 and closes #479 2016-03-29 20:27:23 +01:00
Modmuss50
918f1a0ed5 Merge remote-tracking branch 'origin/1.9' into 1.9 2016-03-29 11:19:49 +01:00
Modmuss50
57220526c0 Update for new json destroyer 2016-03-29 11:19:24 +01:00
Prospector
42c0ad2bfc fix more recipes 2016-03-29 03:01:23 -07:00
Stuart Pomeroy
f9ea484159 Fix non fuels going in the fuel slot. 2016-03-29 10:45:43 +01:00
Stuart Pomeroy
5216082445 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-29 10:31:08 +01:00
Stuart Pomeroy
af7a0e4fd3 Remove test item. 2016-03-29 10:30:55 +01:00
Stuart Pomeroy
4c2877d0d5 Rewrite Transformers, closes #441 2016-03-29 10:29:51 +01:00
Prospector
b06c454634 Upgrade recipes 2016-03-29 02:17:48 -07:00
Stuart Pomeroy
fbfd42427e Fix wrench. 2016-03-29 10:01:18 +01:00
Stuart Pomeroy
ad9f50110a Auto stash for revert of "Closes #443, #466, #468" 2016-03-29 10:00:23 +01:00
Stuart Pomeroy
4f9f98e1bd Revert "Closes #443, #466, #468" 
This reverts commit faa6aa30d0.
 2016-03-29 09:58:32 +01:00
Stuart Pomeroy
faa6aa30d0 Closes #443, #466, #468 2016-03-29 09:58:07 +01:00
Stuart Pomeroy
43aca4d3f4 Merged branch 1.9 into 1.9 2016-03-29 09:43:30 +01:00
Stuart Pomeroy
3282677f02 Fix it so the packs charge things. 2016-03-29 09:43:07 +01:00
Modmuss50
1fa014c098 I may have broken a lot of recipes, can someone check? But it should fix #474 2016-03-29 09:36:00 +01:00
Prospector
58902f3901 Quite a bit of fixes/additions 2016-03-29 00:30:05 -07:00
Prospector
cec54aa0c8 Fix lots of issues 2016-03-28 19:47:00 -07:00
Prospector
620bbfc1df Rework batteries 2016-03-28 16:02:39 -07:00
gigabit101
8280703eb4 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-28 21:52:57 +01:00
gigabit101
ae30dc7685 Added some plate recipes 2016-03-28 21:52:51 +01:00
Stuart Pomeroy
816c92d6b1 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-28 21:43:53 +01:00
Stuart Pomeroy
a8ee636846 Work on the LapotronPack - Hitt forge bug. 2016-03-28 21:43:32 +01:00
gigabit101
9556ceecf9 removed dupe 2016-03-28 21:38:30 +01:00
gigabit101
5b40c9e88e Removed dupe recipes 2016-03-28 21:37:55 +01:00
gigabit101
c1860d6326 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-28 21:33:41 +01:00
gigabit101
1cfa5e79e7 more Recipes 2016-03-28 21:33:36 +01:00
Stuart Pomeroy
7249130c0c Give the debug tool a name 2016-03-28 21:05:08 +01:00
Stuart Pomeroy
12ab5ecc62 Give NukePrimed entity a name. 2016-03-28 21:03:52 +01:00
Prospector
ad50f58133 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-28 12:54:28 -07:00
Prospector
2297eef08d Fix scrapbox loot and add another glass fibre cable recipe 2016-03-28 12:54:17 -07:00
Stuart Pomeroy
2209177e1a Fix config changes etc. 2016-03-28 20:51:23 +01:00
Stuart Pomeroy
83190fc39f Config typos and whatever Thanks @AkTheKnight 2016-03-28 20:45:49 +01:00
Modmuss50
63f31cf673 Merge remote-tracking branch 'origin/1.9' into 1.9 2016-03-28 19:39:56 +01:00
Modmuss50
30052aac18 Quick fix for #427 2016-03-28 19:39:10 +01:00
Prospector
0e4983a0f1 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-28 11:36:34 -07:00
Prospector
112502e09c New machine block textures (thanks @Drullkus) 2016-03-28 11:36:18 -07:00
Modmuss50
fe916ae6b2 Merge branch '1.9' of https://github.com/MrBretze/TechReborn into MrBretze-1.9 
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
 2016-03-28 19:32:06 +01:00
gigabit101
5f4ae53c85 Added WIP to some Items 2016-03-28 18:38:09 +01:00
gigabit101
8fe61a9c54 Recipes for all gem tools and armor 2016-03-28 18:31:32 +01:00
gigabit101
1136574bc2 Chainsaw recipes 2016-03-28 18:13:52 +01:00
gigabit101
d740f167b6 Added WIP tags to a few more Blocks 2016-03-28 18:08:24 +01:00
Stuart Pomeroy
427963b40a Closes #434, Add tooltips to grinder and batbox. Fix centrifuge. closes #436 2016-03-28 17:50:25 +01:00
Stuart Pomeroy
1dfa6c094f Fix Energy Storage not outputting, closes #435 2016-03-28 17:01:36 +01:00
MrBretzel
581b3c8358 The dev is the end 2016-03-28 16:46:29 +02:00
MrBretzel
b503feed8a Force adding ItemStack to Scrapbox List 2016-03-28 16:45:22 +02:00
MrBretzel
a1335f118a New system for recycler registry, juste wool and clay not work, i d'ont why this not work :/ 2016-03-28 16:29:26 +02:00
Stuart Pomeroy
e91a1c2ff1 Closes #433 and fixes a bug i found with #434 2016-03-28 13:57:43 +01:00
Stuart Pomeroy
69507da776 Fix some of #434, waiting on @gigabit101 2016-03-28 13:42:06 +01:00
Stuart Pomeroy
d51a772979 Fix Wrenching, closes #418 2016-03-28 13:35:59 +01:00
Stuart Pomeroy
6054610c3c Fixes lava cells, closes #419 2016-03-28 12:54:41 +01:00
Stuart Pomeroy
6ff03bc706 Fix block item drops and such. Closes #428 2016-03-28 12:23:55 +01:00
Stuart Pomeroy
6247a2093d Merged branch 1.9 into 1.9 2016-03-28 11:47:56 +01:00
Stuart
6149511d0b Frickin. what. 2016-03-28 11:47:20 +01:00
Stuart
ca33b92cea Dont even know. 2016-03-28 11:47:01 +01:00