Commit graph

2143 commits

Author SHA1 Message Date
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
DarkGuardsman
3bc02d8a77 moved some stuff to core lib 2013-12-18 16:00:15 -05:00
DarkGuardsman
c99bf445d3 updated build script 2013-12-18 15:04:31 -05:00
DarkGuardsman
bcb2dc9611 Clean up and import changes 2013-12-18 14:55:01 -05:00
DarkGuardsman
8a8360ba55 Clean up and import changes 2013-12-18 14:54:58 -05:00
DarkGuardsman
82f65af734 Clean up and import changes 2013-12-18 14:54:54 -05:00
DarkGuardsman
ea3883d7c7 Clean up and import changes 2013-12-18 14:54:41 -05:00
DarkGuardsman
69edf26419 Auto-Sync 2013-12-18 08:13:25 -05:00
DarkGuardsman
378a8bd89e Auto-Sync 2013-12-18 08:13:18 -05:00
DarkGuardsman
e8dd09ab68 Auto-Sync 2013-12-18 08:13:11 -05:00
DarkGuardsman
79feaa5bd6 import changes 2013-12-18 08:11:46 -05:00
DarkGuardsman
59bd273bff moved access api to core lib 2013-12-18 07:27:19 -05:00
DarkGuardsman
d08d449e53 starting on removing some parts 2013-12-18 07:16:03 -05:00
Robert
19c4464b3c changed creative tab loading 2013-12-12 22:15:52 -05:00
Robert
a27ccb3b44 changed creative tab loading 2013-12-12 22:05:55 -05:00
Robert
36bae2fa55 changed creative tab loading 2013-12-12 22:02:54 -05:00
Robert
1d3a8f1d5b changed creative tab loading 2013-12-12 22:01:41 -05:00
Robert
d7a25fae49 Fixed an issue with pipes filling 2013-12-12 20:25:54 -05:00
Robert
45367e6e51 updated en_US 2013-12-12 19:29:03 -05:00
Robert
3fc8bbb317 updated en_US 2013-12-12 19:26:43 -05:00
Robert
561e52ed46 reworked textures and langs a bit 2013-12-12 14:01:35 -05:00
Robert
7a52323403 image binary sync 2013-12-12 11:05:51 -05:00
Robert
981e4b9336 faking git out 2013-12-12 11:02:55 -05:00
DarkGuardsman
4e50cc6f91 updated en_US with missing item names 2013-12-12 10:40:33 -05:00