Commit graph

2116 commits

Author SHA1 Message Date
DarkGuardsman
ca3c35894d Fixed Submodules 2013-12-25 08:59:30 -05:00
Robert WC Seifert
b1949163ce Merge pull request #68 from Vexatos/patch-2
Fix all the things!
2013-12-25 05:57:11 -08:00
Vexatos
ea60d385d3 Fix all the things! 2013-12-25 14:56:44 +01:00
DarkGuardsman
e92585d4e8 Fixed update script 2013-12-25 08:53:50 -05:00
Robert
acf97c1707 Revert "CMD Sync while git Client is messed up"
This reverts commit 6dd7bd1160.
2013-12-25 08:24:57 -05:00
Robert
6dd7bd1160 CMD Sync while git Client is messed up 2013-12-25 08:16:13 -05:00
Robert
ebffeb1049 Design notes cleanup 2013-12-25 08:03:46 -05:00
Robert
1d6b738a3e Cleanup of docs folder 2013-12-25 07:26:43 -05:00
Robert
870f1abed9 Folder Changes & Cleanup
Moves folders around to make it easier to navigate the repo
2013-12-25 07:23:41 -05:00
DarkGuardsman
8d3e2bff68 Added IC2 support for the wrench 2013-12-24 01:29:59 -05:00
DarkGuardsman
c4abc14d7e Minor changes 2013-12-23 23:26:25 -05:00
DarkGuardsman
23fb985980 Toying with multiparts 2013-12-23 10:56:21 -05:00
DarkGuardsman
e2446f4611 Fixed Belt network 2013-12-23 04:09:48 -05:00
DarkGuardsman
e5811d09a7 cleanup 2013-12-23 01:52:13 -05:00
Robert
c7a572609b Fixed Battery Box outputs 2013-12-23 00:35:41 -05:00
Robert
c0505ae3cd Added Resistance for network reading 2013-12-23 00:35:27 -05:00
Robert
a5b835800a Fixed a change to wire from UE3.0 2013-12-23 00:35:13 -05:00
Robert
d30b626399 Bug fixes and Updates for UE3.0 2013-12-22 11:23:26 -05:00
Robert
1cae25ad79 re-added wires 2013-12-21 22:49:08 -05:00
Robert
916559e802 updated to UE3.0 and remove unneeded API files 2013-12-21 08:23:45 -05:00
Robert
f47e584fb3 disabled end point renders for belts 2013-12-21 00:33:00 -05:00
Robert
38b2933189 fixed packet handler and channel not being registered 2013-12-20 23:42:54 -05:00
Robert
a0e4418338 fixed most textures and names for objects
Removed a few langs as i fill they were outdated.
2013-12-20 22:56:24 -05:00
Robert
344888ca31 removed ore name debug 2013-12-20 04:58:34 -05:00
Robert
aee3eb08a6 moved and renamed a few files 2013-12-20 04:54:37 -05:00
Robert
45b7980d67 fixed proxy paths 2013-12-20 04:33:57 -05:00
Robert
acb2fed323 more package rework 2013-12-20 04:31:18 -05:00
Robert
2ca9946a68 reworking files
*DarkGuardsman beats files with a wooden mallet* just joking but it
honestly fill like i'm doing a lot of work
2013-12-20 04:18:42 -05:00
Robert
312e46bcc4 moved core machine files to base dir 2013-12-20 02:51:52 -05:00
Robert
a954b83014 Merge coremachine into assembly line 2013-12-20 02:47:43 -05:00
Robert
e5ff931383 . 2013-12-20 02:36:07 -05:00
Robert
89d1a839c8 change in core lib 2013-12-20 02:30:20 -05:00
Robert
be4862063b moved a few things around in api 2013-12-20 02:26:27 -05:00
Robert
62213864cc package refractor and cleanup 2013-12-20 02:24:52 -05:00
Robert
3868dde692 reworked and pieced out some things to other mods 2013-12-20 02:11:52 -05:00
Robert
9dc85a77c3 ton of rework to make the merged mods function 2013-12-20 02:10:49 -05:00
Robert
fb2cdd9f1f removed archive 2013-12-19 23:56:03 -05:00
Robert
8d082306da moved FM to main file 2013-12-19 23:53:25 -05:00
Robert
4fcf8061fa Merge Fluid Mechanics into assembly line 2013-12-19 23:49:28 -05:00
Robert
6f1c61427a changes due to core machine 2013-12-19 23:43:24 -05:00
Robert
294363f313 move farm tech files to correct dir 2013-12-19 23:42:19 -05:00
Robert
22f0e82630 Merge FarmTech into Assembly Line 2013-12-19 23:38:49 -05:00
Robert
bc1df52d11 Assembly line no longer uses the core machine
However we now use the core library which will be built into the
project.
2013-12-19 23:34:27 -05:00
Robert
fd7349e8e1 working on new build script 2013-12-19 23:27:51 -05:00
Robert
e6fc2e2466 deleted a few things and moved things to the core lib 2013-12-19 23:16:57 -05:00
DarkGuardsman
a6a500ddca moved some prefabs to the core lib 2013-12-19 21:07:21 -05:00
Robert
fbe8f627bd moved BlockMachine prefab to core lib
Also renamed DarkMain to CoreMachine
2013-12-19 20:56:48 -05:00
DarkGuardsman
da08059eb9 Clean up and import changes 2013-12-18 16:01:20 -05:00
DarkGuardsman
7d049b98a6 Clean up and import changes 2013-12-18 16:01:18 -05:00
DarkGuardsman
2da4c62035 Clean up and import changes 2013-12-18 16:01:14 -05:00