Commit graph

861 commits

Author SHA1 Message Date
Gig
7c1e72076b Added gui calls to all new machines
Added new gui to matter fab
Added container and slots to matter fab
2015-04-28 17:58:01 +01:00
Gig
30ceed031c Cleaning 2015-04-28 16:18:32 +01:00
Gig
1bfa830f13 Changed machine Materials 2015-04-28 16:07:26 +01:00
Gig
88c8771e8b Moved to Techreborn misc tab 2015-04-28 16:07:02 +01:00
Gig
44814c1aa9 Localizations for new Machines 2015-04-28 16:06:30 +01:00
Gig
34010525ba UU matter 2015-04-27 23:54:22 +01:00
Gig
22a34377e2 Basic Tiles for new machines 2015-04-27 23:51:06 +01:00
Gig
2f9b8a074c More Machines!!!! 2015-04-27 23:43:55 +01:00
Gig
a05b0d01bf More worldgen config pokes @Mj11jM ;) 2015-04-27 22:39:33 +01:00
modmuss50
3c48ea35a7 Added BlastFurnaceRecipe 2015-04-26 17:13:28 +01:00
modmuss50
db62b7a8b8 Now shows the heat of the multiblock 2015-04-26 16:22:26 +01:00
modmuss50
d70038b77f Fixed placing parts inside other parts 2015-04-26 16:05:44 +01:00
modmuss50
98427bbe8a Fixed crash, and lag 2015-04-26 15:35:45 +01:00
modmuss50
f5d58b57eb Fixed crash with cables. 2015-04-26 14:30:34 +01:00
modmuss50
566430d490 Having fun with the new forge!
Done in a different branch because of a depreciated api.
2015-04-26 14:17:59 +01:00
Gig
ea99f354ad Nothing to see here 2015-04-25 22:16:23 +01:00
modmuss50
bc2bf26fc0 Fixed small issue with rendering thanks @amadornes 2015-04-25 12:06:26 +01:00
modmuss50
a80474edd6 fixed compile 2015-04-25 09:24:10 +01:00
modmuss50
0270a917a0 Work on fixing cover dectection 2015-04-25 09:21:06 +01:00
modmuss50
60141026ec Fix multipart checking with Qlib, initial fix of checkOcclusion 2015-04-25 07:38:00 +01:00
Modmuss50
083c24c901 Added all cables, needs a lot of testing :P 2015-04-24 21:22:09 +01:00
Modmuss50
e2467caede Now the multipart system depends on Qlib, wont load if not installed.
Also a code format of the system
2015-04-24 19:46:01 +01:00
Modmuss50
d6797868fb Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/partSystem/IModPart.java
	src/main/java/techreborn/partSystem/QLib/QModPart.java
	src/main/java/techreborn/partSystem/fmp/FMPModPart.java
	src/main/java/techreborn/partSystem/parts/CablePart.java
	src/main/java/techreborn/partSystem/parts/NullPart.java
2015-04-24 19:42:33 +01:00
Modmuss50
0327f3df62 Cables render! Thanks QLIB and @amadornes :) 2015-04-24 19:35:04 +01:00
Gig
4c5477d816 Added Alloysmelter 2015-04-24 15:01:19 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Gig
0f4dcdb5d1 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-23 23:06:07 +01:00
Gig
b8170a9eb4 Fixed spelling 2015-04-23 23:06:01 +01:00
Modmuss50
6232ebc0f5 Removed broken rendering code 2015-04-23 21:23:15 +01:00
Modmuss50
eaa4d304d7 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-23 20:50:04 +01:00
Modmuss50
293a8fbcaf It renders! sort of 2015-04-23 20:49:30 +01:00
Gig
e889b00b6f Added Proxys will need these soon 2015-04-23 20:29:26 +01:00
Gig
4b7b9d4fd2 Removed unused lib 2015-04-23 19:11:30 +01:00
Gig
badc37966a More Localization for @Mj11jM 2015-04-23 19:07:19 +01:00
Gig
ae4f3b5814 Little more work on Achievements 2015-04-23 18:12:11 +01:00
modmuss50
5101abc541 Work on trying to get it to render, still does not work 2015-04-21 18:43:12 +01:00
Gig
214dacffe5 Little work on PDA 2015-04-21 00:55:48 +01:00
Gig
4d8dd1ea4a Added basic rotation to machines 2015-04-20 22:49:58 +01:00
Modmuss50
49d0e480e1 Removed modmussCore 2015-04-20 21:30:24 +01:00
Modmuss50
44d8f09746 Parts are now tiles, they now transmit power :) 2015-04-20 21:16:29 +01:00
Modmuss50
df2ae8b335 Moved into techreborn/partSystem 2015-04-20 21:02:25 +01:00
modmuss50
41795ef16d Removed old ones, and added new ones :) 2015-04-20 20:53:16 +01:00
modmuss50
59bf4d1a9b Initial work on the fmp cable 2015-04-20 18:36:04 +01:00
Gig
1a68b5c7c6 Clean
New achievements
Renamed Manuel to PDA
Moved PDA class's to PDA package
2015-04-18 21:24:49 +01:00
Gig
787df47cfa Started on TechManuel 2015-04-18 12:13:22 +01:00
Gig
a42c707470 Added TechrebornMisc creative tab
Moved dusts and cells to misc tab
2015-04-18 11:47:09 +01:00
Modmuss50
1209c78345 The gui now only opens if there is is a full structure next to it. 2015-04-17 21:13:15 +01:00
Modmuss50
7de15ec1a5 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-17 20:40:43 +01:00
Modmuss50
e7096178cf Added basic 3x3x4 multiblock. Next I need to allow it accept lava, and use different machine casings. 2015-04-17 20:40:33 +01:00
Gig
168497db9b tech reborn Manuel Item 2015-04-17 20:12:58 +01:00
Modmuss50
d7ae47e956 Added BeefCore for multiblock api 2015-04-17 20:09:43 +01:00
Modmuss50
bb58ae8632 This was to complicated, going to make it simpler 2015-04-17 20:00:30 +01:00
Gig
89d29c2a5e Added base metals to worldgen 2015-04-17 19:39:31 +01:00
Gig
dc4bd2724e Added compat for buildcraft (WIP) 2015-04-17 19:39:14 +01:00
Modmuss50
37d8f35aee Ok last time, i check i promise 2015-04-17 18:27:44 +01:00
Modmuss50
c4dd21b39e Fixed some compile errors again, sorry :( 2015-04-17 18:24:52 +01:00
Modmuss50
8d8814bb77 Fixed compile errors with last commit, sorry 2015-04-17 17:46:45 +01:00
Modmuss50
8f33305025 Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/Core.java
2015-04-17 17:43:44 +01:00
Modmuss50
1eb3ef3db6 Some more work on the multiblock system 2015-04-17 17:42:57 +01:00
Gig
d5628ff93a Added basic achievements 2015-04-17 15:53:54 +01:00
Gig
b505eeaf30 Added base Ic2 ores 2015-04-17 12:47:10 +01:00
Modmuss50
cad9b8cc56 Initial work on the multiblock system 2015-04-17 11:23:51 +01:00
modmuss50
1f1096dd49 Fixed crash on place 2015-04-17 08:28:07 +01:00
Gig
dc6d186f67 Start on Blast furnace will get @modmuss50 to finish 2015-04-17 01:09:12 +01:00
Gig
4a3214320c Added Machine casings
Added more textures
2015-04-17 00:15:33 +01:00
Gig
3c87b1ad1d Added cells 2015-04-16 23:42:05 +01:00
Gig
7cbd27150e Added small dusts 2015-04-16 23:27:25 +01:00
Gig
39a8ffe739 Changed name of chestplate to gravity chest plate 2015-04-16 23:26:50 +01:00
Gig
5c3e72ea0d Added hardness to Centrifuge 2015-04-16 23:26:03 +01:00
modmuss50
f599a262b2 fixed incorrect cells 2015-04-15 21:11:34 +01:00
Modmuss50
7e0119bce6 Added more nei handers. 2015-04-15 17:46:35 +01:00
Modmuss50
b7ccae4b8c Got the RollingMachine working 2015-04-15 17:27:05 +01:00
Modmuss50
8e7d6b011e Auto formatted, and cleaned imports 2015-04-15 16:23:12 +01:00
Modmuss50
c001231216 Added nei support for centrifuge 2015-04-15 16:22:15 +01:00
modmuss50
bdea893392 More configs and ISidedInventory 2015-04-14 21:23:45 +01:00
modmuss50
a6451e7946 Removed unneeded null checks. 2015-04-14 19:24:40 +01:00
modmuss50
3e2a3cfaa8 Fixed wrench drops 2015-04-14 19:23:16 +01:00
Gig
60bcbd10ad Moved/Replaced Textures 2015-04-14 16:21:23 +01:00
Gig
8191e1eaaa Added Tcon dusts/ingots 2015-04-14 14:41:53 +01:00
Gig
b51a1d498c Even more configs !! 2015-04-14 13:15:47 +01:00
Gig
7d48b81baf made machines wrenchable 2015-04-14 12:57:43 +01:00
Modmuss50
777f54cefd Fixed itemstacks having a null item in them. 2015-04-14 11:09:13 +01:00
Modmuss50
f49b8c27c2 Fixed the centrifuge, still needs some testing. 2015-04-14 08:35:44 +01:00
Gig
4746968a04 Moved batpack/lapotronpack to Items/Armor
Added Gravity Chestplate (WIP)
2015-04-14 01:09:38 +01:00
Gig
700276fb09 Failing ;) 2015-04-14 00:12:24 +01:00
Modmuss50
84ee22b859 Fixed a few crashes, will finish fixing them tomorrow. 2015-04-13 21:02:30 +01:00
Modmuss50
7e9031352a It seams like it works :), still needs some testing. 2015-04-13 20:54:31 +01:00
Modmuss50
822879a6b6 Made it work, need to figure out the ic2 cells, for now it uses resin 2015-04-13 20:36:16 +01:00
Modmuss50
1824e0bf36 WAILA now shows all of the items in the chest 2015-04-13 20:06:20 +01:00
Modmuss50
d45bd4e85c Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-13 20:00:29 +01:00
Modmuss50
2a7b9e19ee Added basic Centrifuge logic. Not finished 2015-04-13 19:59:52 +01:00
Gig
6dec53208e More Configs!!!!! 2015-04-13 19:50:35 +01:00
Gig
dbb6a9edf2 Added advanced drill
Added TorchHelper.class
2015-04-13 19:08:17 +01:00
Gig
831eacbd29 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-13 18:43:47 +01:00
Gig
4a291087ad Added omnitool 2015-04-13 18:43:31 +01:00
Modmuss50
bd357e0a2c Added the basic gui, block and tile for the centrifuge 2015-04-13 18:40:13 +01:00
Gig
2b0fd80def Fixed a few spelling mistakes in config 2015-04-13 00:55:53 +01:00
Gig
49474e741e Added charged/uncharged tools to creative tab 2015-04-12 23:39:38 +01:00
Gig
bdc34c393d Added LapotronPack 2015-04-12 23:38:30 +01:00
Gig
a46645ff42 Added lithiumbatpack 2015-04-12 23:22:53 +01:00
Gig
da6e88c254 Added rockcutter 2015-04-12 22:45:13 +01:00
Gig
112139ae66 Added gems to oreDict 2015-04-12 21:00:25 +01:00
Gig
1d001364e2 Added recipes for storage blocks 2015-04-12 20:55:11 +01:00
Gig
8366831c62 Fixed a recipes issue 2015-04-12 20:36:21 +01:00
Gig
e4fc82b574 Added storage blocks to oreDict 2015-04-12 20:25:36 +01:00
Gig
f50f144b28 Added storage blocks 2015-04-12 20:21:33 +01:00
Gig
9b5a57bedb More recipes and organized imports 2015-04-12 20:04:12 +01:00
Gig
9712d3828f Changed some IC2 recipes 2015-04-12 18:09:49 +01:00
Gig
d9def7932a Added all ingots to oreDict 2015-04-12 18:09:11 +01:00
Gig
ddd2064a02 A few textures from the wiki ;) 2015-04-12 17:26:01 +01:00
Gig
0a14a36ef4 Added craftingHelper and basic recipes 2015-04-12 16:43:51 +01:00
modmuss50
acb03ff4aa Started working on the multiplayer fix 2015-04-12 16:33:04 +01:00
Gig
4c8a736f58 Lowered Iridiums spawn rate 2015-04-12 15:53:59 +01:00
Gig
fe50e82b76 Fixed a derp in oreDict registry 2015-04-12 15:53:22 +01:00
Gig
961e8f047a Added all ores to Oredict 2015-04-12 14:59:29 +01:00
modmuss50
ee14540196 Removed 2 PreInits, added waila support 2015-04-12 11:39:06 +01:00
modmuss50
e57f1c1e85 Added api package file, testing some gradle changes 2015-04-12 10:25:06 +01:00
modmuss50
fcfc6ed1df added centrifuge recipe + moved itemUtils to its own class 2015-04-12 10:15:53 +01:00
modmuss50
91495286db Clean imports 2015-04-12 09:45:31 +01:00
modmuss50
c942a2278f fixes #1 2015-04-12 09:44:22 +01:00
Gig
a07946c307 Added OreDict to all dusts 2015-04-12 00:03:49 +01:00
Gig
d08da07678 Basic Api (dose nothing yet) 2015-04-12 00:02:56 +01:00
Gig
042f18fbf6 Added a LogHelper for easy logging 2015-04-11 23:13:38 +01:00
Gig
a2995d8cd5 A few textures from @CyanideX texture pack with permission 2015-04-11 23:03:45 +01:00
Gig
4658baab8a Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 21:31:51 +01:00
Gig
3d5439b511 Added Localizations for dusts/gems/ingots/parts 2015-04-11 21:31:38 +01:00
modmuss50
ea812914e8 Fixed building again 2015-04-11 21:03:25 +01:00
Gig
e87f2d2430 Added all gems and crafting parts 2015-04-11 20:46:55 +01:00
Gig
b08afb1d5a Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 19:40:07 +01:00
Gig
801598dc95 WorldGen GET!!!! 2015-04-11 19:40:01 +01:00
modmuss50
66c1e7ec34 quantumTank now holds fluid when broken with a wrench 2015-04-11 19:13:31 +01:00
modmuss50
28abe89511 quantumChest now holds items when broken with a wrench 2015-04-11 19:08:22 +01:00
modmuss50
4cdf4aa7db Added config for ThermalGenerator eu out 2015-04-11 18:29:46 +01:00
Gig
9f99812490 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 18:21:54 +01:00
Gig
adf2558b90 Added WorldGen configs 2015-04-11 18:21:41 +01:00
modmuss50
12a96054dc Fixed drops with wrench 2015-04-11 18:14:57 +01:00
Gig
4e9a738c44 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 18:11:51 +01:00
Gig
a054ac6eba Added config and GuiConfig 2015-04-11 18:11:37 +01:00
modmuss50
a5e18a5b32 Fixed build issues, If we need the whole of ic2 we can add it. 2015-04-11 18:04:36 +01:00
Gig
b3d6ea1358 Made QTank/QChest Wrench able 2015-04-11 17:32:45 +01:00
Gig
57c38eb99e Ore Localizations and changed ore names to "techreborn.ore" 2015-04-11 17:24:32 +01:00
modmuss50
5d76333dd1 Added textures for the quantum stuff 2015-04-11 17:20:53 +01:00
modmuss50
53f540799d Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 17:12:47 +01:00
modmuss50
57963575b3 Fixed stackSize issues 2015-04-11 17:12:21 +01:00
Gig
f77e932ef5 Added mod dependencies
Moved Modname and modid to ModInfo.class
2015-04-11 17:12:07 +01:00
Gig
0223f6ae1d Moved Item/Block Registration 2015-04-11 17:03:14 +01:00
Gig
c959f92558 Textures for all the ores 2015-04-11 16:49:46 +01:00
Gig
e87908dc03 Added all gtechs ores 2015-04-11 16:21:49 +01:00
Gig
2281511a20 Added a hardness value to machines 2015-04-11 16:21:24 +01:00
modmuss50
92605dd50f Merge remote-tracking branch 'origin/GigDev'
Conflicts:
	src/main/java/techreborn/Core.java
2015-04-11 15:17:42 +01:00
modmuss50
0e6d635e8d Fixed shift clicking crash, now saves the inventory of the chest 2015-04-11 11:53:27 +01:00
modmuss50
b41adffa60 added quantumChest 2015-04-11 11:30:16 +01:00
modmuss50
1360258257 Added quamtumTank 2015-04-11 10:37:47 +01:00
Gig
1704f989c5 Added ItemTR.class for easy item creation 2015-04-11 00:37:04 +01:00
Gig
6df95800e1 Added basic recipe remover for use in overriding Ic2 recipes. 2015-04-11 00:29:11 +01:00
Gig
0e2ad2637f Added basic Item for all the dusts 2015-04-11 00:12:59 +01:00
modmuss50
ce031af8e7 Added creative tab and Lang Files 2015-04-10 10:55:00 +01:00
modmuss50
25272228e2 Finished the Thermal Generator 2015-04-10 10:43:52 +01:00
modmuss50
07fe6ab3db Added some small things 2015-04-10 10:29:08 +01:00
modmuss50
700012697e Finishing off for tonight. 2015-04-10 00:18:13 +01:00
modmuss50
da25ed6add Added basic mod :) 2015-04-09 23:17:30 +01:00