Commit graph

1490 commits

Author SHA1 Message Date
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
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
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
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
Robert
19c4464b3c changed creative tab loading 2013-12-12 22:15:52 -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
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 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
Vexatos
3028edc401 Update de_DE.properties 2013-12-09 17:47:17 +01:00
Vexatos
c66d896484 Update de_DE.properties 2013-12-09 17:45:39 +01:00
Robert
6f8c42d9ba . 2013-12-06 15:55:33 -05:00
Robert
09484b5ee2 Partly fixed pipes 2013-12-06 15:22:44 -05:00
Robert
9bb6098362 Fixed a few issues with picking up tanks
Issues with inf fluid bug
Issues with render crash
2013-12-06 08:06:07 -05:00
DarkGuardsman
826acc8c0d Cleaned up release valve tile entity 2013-12-04 17:43:22 -05:00
DarkGuardsman
388ab18e62 Fixed a render issue with pipe connections
Name connecting to release valve
2013-12-04 15:14:00 -05:00
DarkGuardsman
9686422ff4 Fixed an issue with tank render 2013-12-04 15:09:37 -05:00
DarkGuardsman
23dc4f8073 Got tank item render work with fluids 2013-12-04 14:57:55 -05:00
DarkGuardsman
1394b4fccf Tanks can be picked up with fluid inside 2013-12-04 14:23:59 -05:00
DarkGuardsman
6110377655 Crates can now be stacked to 64
That is if they are empty
2013-12-04 14:22:43 -05:00
DarkGuardsman
403c8431f8 Import changes 2013-12-04 14:07:13 -05:00
DarkGuardsman
5d54992f14 Import changes 2013-12-04 14:07:00 -05:00
DarkGuardsman
f6a42dd58a Updated tank names 2013-12-04 14:06:15 -05:00
DarkGuardsman
3fbcb21bde Import Changes 2013-12-04 14:06:09 -05:00
DarkGuardsman
6d785adf35 Import changes 2013-12-04 11:48:37 -05:00