57 Commits

Author SHA1 Message Date
KitsuShadow
9a57513a11 Alpha Push 2015-08-30 15:44:54 -04:00
KitsuShadow
6849d117cb need sounds 2015-08-30 14:19:03 -04:00
KitsuShadow
a2fbde8efe Grinder Recipes working 2015-08-30 09:25:44 -04:00
KitsuShadow
c87cae4e94 grinderrecipe fixes 2015-08-30 05:40:12 -04:00
KitsuShadow
e2245c0519 more work on crank power 2015-08-29 23:15:25 -04:00
KitsuShadow
a774fd5a9e Merge branch 'DEV' into Kitsu 2015-08-29 21:28:38 -04:00
KitsuShadow
e5a69ffba2 Grinder Initial Test Working 2015-08-29 21:28:14 -04:00
Fluid1C3
71d0eab21a Merge branch 'DEV' into Fluid 2015-08-29 20:21:34 -05:00
Fluid1C3
028eacb74e Ore Dust 2015-08-29 20:17:22 -05:00
KitsuShadow
a349ddad95 damn grinder 2015-08-29 17:35:02 -04:00
KitsuShadow
8a3a1d0698 Merge branch 'Kitsu' into DEV 2015-08-29 11:34:08 -04:00
KitsuShadow
0a6b95efa8 Rotation for Grinder incorrect, needs redo origin? 2015-08-29 11:33:55 -04:00
KitsuShadow
2f51a3dc70 crankgrinder 2015-08-29 06:37:36 -04:00
KitsuShadow
dbdaff9bab Merge branch 'Kitsu' into DEV 2015-08-28 22:10:11 -04:00
KitsuShadow
fbbd60c69b grinder model 2015-08-28 22:09:35 -04:00
KitsuShadow
58593139ea Merge branch 'Kitsu' into DEV 2015-08-28 22:06:23 -04:00
KitsuShadow
55a51bf025 Merge branch 'DEV' of ssh://git.nmd.so:12000/kitsu/nmdenergy into DEV 2015-08-28 22:06:08 -04:00
KitsuShadow
8d27bf0f14 Merge branch 'Kitsu' of ssh://git.nmd.so:12000/kitsu/nmdenergy into Kitsu
merge
2015-08-28 22:05:33 -04:00
KitsuShadow
78bd0c8d70 Power Variable 2015-08-28 04:22:18 -04:00
KitsuShadow
139dc490b1 rm packet handle 2015-08-25 07:47:23 -04:00
KitsuShadow
16ff900333 Lathe working 2015-08-25 07:44:24 -04:00
KitsuShadow
1af78e907b Lathe Working 2015-08-24 20:32:12 -04:00
KitsuShadow
32ebd7a69e shits working now 2015-08-24 07:01:20 -04:00
KitsuShadow
89abfb551c rotating but not well 2015-08-23 06:30:30 -04:00
KitsuShadow
55e904eb69 More Lathe logic 2015-08-22 07:08:03 -04:00
KitsuShadow
a42607aab4 Lathe Container 2015-08-21 22:49:51 -04:00
KitsuShadow
4832b33b0c Lathe Model in game 2015-08-21 06:40:28 -04:00
KitsuShadow
812260f3a2 lathe finished blend 2015-08-20 05:04:51 -04:00
KitsuShadow
14165ee430 Lathe Blend 2015-08-19 22:54:32 -04:00
KitsuShadow
d43952c42e Crank Activation / Rotation / Powered all working 2015-08-17 05:40:23 -04:00
KitsuShadow
e7d0d526c0 crank rotation test 2015-08-17 01:34:21 -04:00
KitsuShadow
4f28b5164d Metadata for crank and lathe blend 2015-08-16 07:08:41 -04:00
Fluid1C3
2838319c1c Merge branch 'DEV' of ssh://git.nmd.so:12000/kitsu/nmdenergy into DEV 2015-08-15 20:10:56 -05:00
Fluid1C3
0eccc1bcf7 Merging 2015-08-15 20:10:11 -05:00
KitsuShadow
195f003ac9 crank.blend 2015-08-15 21:06:03 -04:00
KitsuShadow
cf52b3c950 Rendering is working, tile base is broken, also registry not working? 2015-08-15 02:43:03 -04:00
KitsuShadow
e961b16b0e Merge branch 'DEV' into Kitsu
Merge DEV into Kitsu
2015-08-14 22:01:32 -04:00
Fluid1C3
21cc50c34e Items added and crafting handler 2015-08-14 19:08:58 -05:00
KitsuShadow
929c9fdb4e Blends Directory and Crank Blend 2015-08-14 03:46:56 -04:00
KitsuShadow
0fbfe0d7bc Merge branch 'DEV' into Kitsu
commit message
2015-08-13 03:17:27 -04:00
KitsuShadow
08eba606d3 Main 2015-08-12 22:59:10 -04:00
Fluid1C3
5e0c435917 ModInfo file includes proxy and ID's 2015-08-12 17:14:25 -05:00
KitsuShadow
40c99666b5 Tile Entity Package and Registry 2015-08-12 03:43:53 -04:00
Fluid1C3
245a2f41c4 Fluid's awesome 2015-08-11 20:29:45 -05:00
Fluid1C3
cfd28f0773 more more git cleanup 2015-08-11 20:25:10 -05:00
Fluid1C3
c6ea9292c6 more git cleanup 2015-08-11 20:04:51 -05:00
Fluid1C3
dbc2fe6b55 Base Packages 2015-08-11 20:03:03 -05:00
Fluid1C3
bbe02dc6dd ? 2015-08-11 19:29:10 -05:00
Fluid1C3
51be103f54 damn gitignore 2015-08-11 19:28:08 -05:00
Fluid1C3
6689f0d9bb gitignore 2015-08-11 19:26:16 -05:00