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 |
|
DarkGuardsman
|
0808668742
|
Worked on ore dictionary support
|
2013-12-12 10:40:18 -05:00 |
|
DarkGuardsman
|
171967322c
|
added lang to load list
|
2013-12-10 07:25:06 -05:00 |
|
DarkGuardsman
|
62d716e818
|
Merge branch 'master' of https://github.com/DarksCoreMachine/Assembly-Line
|
2013-12-10 07:24:11 -05:00 |
|
DarkGuardsman
|
53c9d95516
|
Drone idea pic
|
2013-12-10 07:24:01 -05:00 |
|
Robert WC Seifert
|
244edc9db1
|
Merge pull request #65 from Hisirious/master
Create pt_BR.properties
|
2013-12-10 04:22:02 -08:00 |
|
Hisirious
|
672b8a93f8
|
Create pt_BR.properties
|
2013-12-10 10:03:08 -02:00 |
|
Robert
|
08231cfbcc
|
WIP: started on en_US lang file
|
2013-12-09 13:05:54 -05:00 |
|
Robert
|
60ebbe3147
|
Merge branch 'master' of https://github.com/DarksCoreMachine/Fluid-Mechanics
|
2013-12-09 12:27:52 -05:00 |
|
Robert
|
208078dee6
|
cleanup & formatting
|
2013-12-09 12:23:30 -05:00 |
|
Robert
|
0ff279faa8
|
cleanup & formatting
|
2013-12-09 12:20:54 -05:00 |
|
Robert
|
46acce1582
|
cleanup & formatting
|
2013-12-09 12:20:15 -05:00 |
|
Robert
|
3b24c5b806
|
Merge branch 'master' of https://github.com/DarksCoreMachine/CoreMachine
|
2013-12-09 12:19:09 -05:00 |
|
Robert
|
8e56fd39fe
|
Placed laser render in a try & catch
not exactly a fix but will prevent crashes
|
2013-12-09 12:18:57 -05:00 |
|
Robert
|
f4f053679b
|
Cleaup
|
2013-12-09 12:18:27 -05:00 |
|
Robert WC Seifert
|
b548f16c68
|
Merge pull request #54 from Vexatos/patch-2
Updated de_DE.properties
|
2013-12-09 09:00:57 -08:00 |
|
Robert WC Seifert
|
d12fa0319c
|
Merge pull request #64 from Vexatos/patch-2
Update de_DE.properties
|
2013-12-09 09:00:51 -08:00 |
|
Vexatos
|
71fa9d4676
|
Update de_DE.properties
|
2013-12-09 17:53:39 +01:00 |
|