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

288 commits

Author SHA1 Message Date
Gig
617a33aea3 More machines 2015-05-04 21:26:51 +01:00
Gig
88080bccb9 Fixed textures for casing 2015-05-04 21:02:39 +01:00
Tntrololol
e780191616 More syntax errors... 2015-05-04 13:59:19 -05:00
Tntrololol
5378cd2134 Added various missing parts and reactor components 2015-05-04 13:57:15 -05:00
Tntrololol
a303ddad62 Fixed yellow garnet misspelling. 2015-05-04 13:31:31 -05:00
modmuss50
37b5aa73ba Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-04 19:07:50 +01:00
modmuss50
7f52e4f5e0 Fixed incorrect textures 2015-05-04 19:07:22 +01:00
Gig
465519cbd0 Added things 2015-05-04 19:06:42 +01:00
Gig
6ad1c8bdea Added aesu 2015-05-04 19:01:03 +01:00
modmuss50
7257da06e9 Added a massive amount of textures from @Tntrololol 2015-05-04 18:40:45 +01:00
modmuss50
2901466288 Started work on the multiBlock 2015-05-04 08:44:44 +01:00
modmuss50
77fb5949b9 Fixed compile errors 2015-05-04 08:02:01 +01:00
Tntrololol
9aff74fddc Missed a few 2015-05-03 23:37:20 -05:00
Tntrololol
77f761f1a6 Missed one 2015-05-03 23:36:55 -05:00
Tntrololol
6884f4ff1c Added missing ingots and fixed capitalization 
Added ingots for antimony, battery alloy, red alloy, blue alloy, cadmium, cupronickel, indium, kanthal, lodestone, magnalium, nichrome, and tellurium.
 2015-05-03 23:35:13 -05:00
Tntrololol
46a10b8cc7 Replaced olivine with peridot 2015-05-03 23:28:28 -05:00
Tntrololol
859ebc047e Fixed copy paste mistake 
Sorry, currently not using an IDE.
 2015-05-03 23:27:02 -05:00
Tntrololol
220febc0c5 Added missing small dusts and fixed capitalization 
Added small dusts for antimony, biotite, cadmium, cupronickel, dark iron, glowstone, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, "redstone", silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
 2015-05-03 23:25:23 -05:00
Tntrololol
636528bddc Added missing dusts and fixed capitalization 
Added dusts for antimony, biotite, cadmium, cupronickel, dark iron, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
 2015-05-03 23:17:09 -05:00
Tntrololol
982ec40192 Added tritium cell 2015-05-03 22:54:38 -05:00
Gig
d6b38f238e test fix for no textures on ingots 2015-05-04 00:18:35 +01:00
Gig
786d609d86 Fixed rockcutter breaking 2015-05-03 23:53:33 +01:00
Gig
6143f990fe Added IDSU 2015-05-03 23:49:30 +01:00
Gig
78afb4b57f Added platecuttingmachine 2015-05-03 23:37:30 +01:00
Gig
a732052f49 Added lathe 2015-05-03 23:34:49 +01:00
Gig
d9cf998d16 Added chemicalreactor 2015-05-03 23:30:44 +01:00
Gig
77f801f1a9 Added alloyfurnace 2015-05-03 23:25:16 +01:00
Gig
f0d0d2738e Added semifluidgenerator 2015-05-03 23:13:45 +01:00
Gig
afc750993c Added magicrnergyabsorber 2015-05-03 23:09:13 +01:00
Gig
7e8ab75b3e Changed more texture stuff 2015-05-03 22:59:49 +01:00
Gig
20dd587795 Added industrialelectrolyzer 2015-05-03 22:58:11 +01:00
Gig
8c7702c9dc Added DieselGenerator 
more texture stuff
 2015-05-03 22:54:06 +01:00
Gig
16cdb106c7 0 not 6 2015-05-03 22:43:27 +01:00
Gig
a386a35ead Fixed bottom textures 2015-05-03 22:27:19 +01:00
Gig
dec2c68e86 More texture changes 2015-05-03 22:15:39 +01:00
Gig
8910f9f9db Added textures 
Added Dragoneggsiphoner
 2015-05-03 21:48:10 +01:00
Gig
ab41f1b866 Added highlyadvancedmachineblock 
some texture stuffs
 2015-05-03 18:00:09 +01:00
Gig
e2c1f1307b Fixed something I broke 2015-05-03 17:33:27 +01:00
Gig
437318ece9 Changed texture stuffs 2015-05-03 17:22:39 +01:00
Gig
13b4d73e5a Little cleaner 2015-05-03 15:53:42 +01:00
Gig
ce1ff273c2 Textures for other ores 2015-05-03 15:39:15 +01:00
Gig
7914f530d2 More Configs 2015-05-03 15:24:35 +01:00
Gig
c9eb3b8a02 Configs 2015-05-03 15:05:12 +01:00
Gig
3e9e8a9f92 Added all uu recipes 2015-05-03 14:57:06 +01:00
modmuss50
4ae6522b34 Now uses the ic2 icons, they seams to be a bit off, will check them later 2015-05-03 14:46:17 +01:00
modmuss50
2ae61a7625 added the button to the centrifuge 2015-05-03 14:34:41 +01:00
modmuss50
39492fadbd Added button for recipes, fixed syncing with tanks 2015-05-03 14:31:19 +01:00
Gig
26b60d2896 Removed OLD textures 
Added texture for uu
Added 1st uu recipe
Added configs
 2015-05-03 13:49:28 +01:00
modmuss50
18c2ec19cf Attempted to fix sync issues 2015-05-03 08:16:59 +01:00
modmuss50
fc82d9aa56 Fixed spelling 2015-05-02 14:55:11 +01:00
modmuss50
bd59b48d02 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-01 20:07:47 +01:00
modmuss50
5e8f8978ee fixed compile again 2015-05-01 20:07:37 +01:00
Gig
16ab2cfa06 Added new recipe to buildcraft quarry 2015-05-01 20:05:34 +01:00
modmuss50
68c3437316 it compiles now :) 2015-05-01 20:04:31 +01:00
modmuss50
2616894527 Some small tweaks to the blast furnace, not tested 2015-05-01 19:50:31 +01:00
modmuss50
4409aec56a Added nei handler 2015-04-29 16:02:03 +01:00
Gig
8dda3c5ef5 Doing stuff and things 2015-04-29 13:34:08 +01:00
Gig
fc2265d0eb A few little things added to chunk loader 2015-04-29 13:08:07 +01:00
Gig
1826927149 Added gui and buttons to Chunkloader 2015-04-28 21:41:10 +01:00
modmuss50
fed4ea8bd7 Allows the recipes to be made backwards 2015-04-28 21:27:23 +01:00
modmuss50
ff866d9352 Fixed part crash and got the blast furnace to work! 2015-04-28 21:24:52 +01:00
Gig
92cccee9e9 Basic gui and container 2015-04-28 21:09:38 +01:00
modmuss50
0c514596a1 Added untested recipe code 2015-04-28 21:04:31 +01:00
Gig
e67b55eaff Basic block and tile for Industrial Chunkloader 2015-04-28 20:56:50 +01:00
Gig
1a2c0d483f Switch the output slots to SlotOutput instead of slot on new machines 2015-04-28 20:44:11 +01:00
Gig
72471b9dae Added gui texture for the Icompressor 
Added container for Icompressor
 2015-04-28 20:42:33 +01:00
modmuss50
b99cac1a1c Server now starts 2015-04-28 20:38:13 +01:00
Gig
fbbe621074 Need to get a gui texture for this :D 2015-04-28 20:29:27 +01:00
Gig
71d4a20d02 Finished container on Grinder 2015-04-28 20:21:29 +01:00
modmuss50
72ec08f069 Started work on the Blast furnace 2015-04-28 18:23:48 +01:00
Gig
1238f2d5a6 Started on Grinder will finish when I get back 2015-04-28 18:05:47 +01:00
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
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
Mj11jM
6e0ec1d861 Updated more! 
Commiting this before it's lost. Will finish up the tool-tips later on.
 2015-04-23 16:20:04 -07:00
Mj11jM
aa5546af3f Update en_US.lang 2015-04-23 15:15:28 -07: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