Commit graph

2550 commits

Author SHA1 Message Date
Gig
b8170a9eb4 Fixed spelling 2015-04-23 23:06:01 +01:00
Mj11jM
44d36465aa Update en_US.lang for new GUIConfig and spacing
@gigabit101 let me know if there is more to do.
2015-04-23 14:44:50 -07: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
0aa7927e28 Merge branch 'fmp' 2015-04-20 21:35:30 +01:00
Modmuss50
04719c8bd0 Merge branch 'fmp' of https://github.com/TechReborn/TechReborn into fmp 2015-04-20 21:30:45 +01:00
Modmuss50
49d0e480e1 Removed modmussCore 2015-04-20 21:30:24 +01:00
Modmuss50
d522d10c95 Removed momussCore 2015-04-20 21:28:54 +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
5164301ffb Added my Part API, need ModmussCore and QLIB 2015-04-20 20:08:14 +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
Modmuss50
314a9637b7 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-17 19:42:47 +01:00
Modmuss50
da98fc02a3 Still not sure this will work 2015-04-17 19:42:09 +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
ce581cd27a Testing thermal expansion in gradle. 2015-04-17 19:30:36 +01:00
Modmuss50
e21adb0bd8 Added buildcraft 2015-04-17 18:38:03 +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
8bd7974a74 Fixed some gui textures 2015-04-17 15:53:33 +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