Commit graph

2145 commits

Author SHA1 Message Date
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
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 WC Seifert
623895e9eb Merge pull request #17 from Vexatos/patch-1
Update de_DE.properties
2013-12-09 08:41:42 -08:00
Vexatos
558db65da9 Update de_DE.properties 2013-12-09 17:32:22 +01:00
Robert
edafda5fce fixed build script 2013-12-06 15:56:23 -05: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
1e25feee01 update lang file 2013-12-04 14:05:36 -05:00
DarkGuardsman
14ce020223 added option for item to go to player 2013-12-04 13:53:16 -05:00
DarkGuardsman
20d38222bb Worked on battery box
Change rotate with wrench and added shift click pickup support.
2013-12-04 13:49:14 -05:00
DarkGuardsman
1c6be93db8 refractor/move/cleanup 2013-12-04 13:36:17 -05:00
DarkGuardsman
12bc882ec9 Moved some stuff around 2013-12-04 13:01:55 -05:00
DarkGuardsman
1c6a60c0c5 more cleanup 2013-12-04 12:52:12 -05:00
DarkGuardsman
784f8fa366 removed some classes 2013-12-04 12:26:05 -05:00
DarkGuardsman
6d785adf35 Import changes 2013-12-04 11:48:37 -05:00
DarkGuardsman
0ef16b6312 Import changes 2013-12-04 11:48:11 -05:00
DarkGuardsman
1e167cb2e6 File changes 2013-12-04 11:47:42 -05:00
DarkGuardsman
3fd7b8e229 Starting to separate core from content
At some point in the near future the core will need to act as a library
more than a mod. Though it will still need to have its common items, and
blocks. Such as parts, and ores. Machines like the battery box, wire,
and generator will be moved to another mod.
2013-12-04 11:40:26 -05:00
DarkGuardsman
76cd56a6cc Auto-Sync 2013-12-04 07:46:20 -05:00
DarkGuardsman
6dea7410b2 Auto-Sync 2013-12-04 07:46:16 -05:00