Commit Graph

319 Commits

Author SHA1 Message Date
elite
d76e9e74f8 "complete new iron block json" 2017-04-07 23:39:15 -05:00
elite
0914321e9b Merge branch 'featureMoreIron' of ssh://git.nmd.so:12000/nmd/ForgeCraft into featureMoreIron 2017-04-07 23:11:18 -05:00
elite
42b81e37d8 adding json assets 2017-04-07 23:11:03 -05:00
Mohammad-Ali Minaie
639236d16a add textures 2017-04-07 23:56:41 -04:00
elite
4e21471c22 Merge branch 'featureMoreIron' of ssh://git.nmd.so:12000/nmd/ForgeCraft into featureMoreIron 2017-04-07 21:04:58 -05:00
Mohammad-Ali Minaie
c8aca2f3af added ironanvil json assets 2017-04-07 21:32:03 -04:00
elite
f6306c5685 "Positioning musket properly while shooting" 2017-04-06 22:19:45 -05:00
Mohammad-Ali Minaie
20cf2570cb all new item objects added 2017-04-06 22:28:19 -04:00
Mohammad-Ali Minaie
4e3c9e6943 toolparts 2017-04-06 22:07:49 -04:00
Mohammad-Ali Minaie
67e2f4a5f4 modified push script 2017-04-06 21:30:49 -04:00
Mohammad-Ali Minaie
e7ee4138d9 updated itemBall type objects 2017-04-06 21:29:16 -04:00
Mohammad-Ali Minaie
28b976f868 updating and continuing content add 2017-04-06 21:14:08 -04:00
elite
4589149cb0 "changing velocity of musket projectile" 2017-04-04 20:16:28 -05:00
Mohammad-Ali Minaie
fbe99fd38b Updating branch 2017-04-04 17:42:04 -04:00
Mohammad-Ali Minaie
fc0b4e7394 not sure what changes i made 2017-04-04 07:12:49 -04:00
elite
f675537329 "Adding right-click functionalitytarting to add right-click functionality to musket" 2017-04-03 21:28:41 -05:00
Mohammad-Ali Minaie
cd8365533a added clean iron block, textures, and hot 2017-04-02 22:16:04 -04:00
elite
be17c83fef local comit for merging 2017-04-02 15:23:19 -05:00
Mohammad-Ali Minaie
0efdd46d61 Merge branch 'master' of ssh://git.nmd.so:12000/nmd/ForgeCraft 2017-04-02 16:04:29 -04:00
elite
72fde890a6 "updating version number" 2017-04-02 14:54:04 -05:00
a3d4ce8434 Merge branch 'ironsword2' of nmd/ForgeCraft into master 2017-04-02 19:49:40 +00:00
elite
68f8c263e3 "Re-committing new iron sword model for pull request" 2017-04-02 14:44:27 -05:00
elite
a4c6c71644 "committing new iron sword model for pull request" 2017-04-02 14:39:42 -05:00
elite
66c55ad61e Adding Matchlock Musketas an in-game item 2017-04-02 13:51:03 -05:00
Mohammad-Ali Minaie
7bcfe8185e Merge branch 'master' of ssh://git.nmd.so:12000/nmd/ForgeCraft 2017-04-02 14:14:28 -04:00
Mohammad-Ali Minaie
c881085f2d updating modblocks 2017-04-02 14:13:11 -04:00
elite
04b4be3479 Adding Matchlock Musket modeldope looking Matchlock Musket model 2017-04-02 13:11:52 -05:00
elite
6aff8638ec Adding line to notes.txt that no one will read 2017-04-01 22:29:21 -05:00
elite
84d7de7b2a Merge branch 'master' of github.com:kitsushadow/forgecraft 2017-04-01 22:04:18 -05:00
Mohammad-Ali Minaie
e8d6c05104 Merge branch 'master' of ssh://git.nmd.so:12000/nmd/ForgeCraft 2017-04-01 23:03:01 -04:00
Mohammad-Ali Minaie
9b5b3b0b3a update to tileanvil 2017-04-01 23:02:51 -04:00
kitsushadow
70610cc8ca trying with no fetch 2017-04-01 23:01:15 -04:00
elite
46f2859ced trying to unfuck my git and add files 2017-04-01 21:54:56 -05:00
Mohammad-Ali Minaie
0c93042f9e Merge branch 'featureMoreIron' 2017-04-01 21:29:56 -04:00
Mohammad-Ali Minaie
9f1f8e4f91 modified push script 2017-04-01 21:27:50 -04:00
Mohammad-Ali Minaie
efc3a2b7f9 updating ModBlocks 2017-04-01 21:26:03 -04:00
Mohammad-Ali Minaie
bd140502f5 updating ignore 2017-04-01 20:29:36 -04:00
Mohammad-Ali Minaie
3eb0df434c fixed rendering bugs 2017-04-01 13:54:48 -04:00
Mohammad-Ali Minaie
4d01df0df7 updates and fixes 2017-04-01 00:02:30 -04:00
Mohammad-Ali Minaie
ad6483810a fixed axe error 2017-03-31 18:41:23 -04:00
Mohammad-Ali Minaie
610fb6a788 updated to-dos 2017-03-31 07:52:57 -04:00
Mohammad-Ali Minaie
20d4cf179d fixed primal dependency and added new tool material types 2017-03-30 21:34:53 -04:00
Mohammad-Ali Minaie
0eb517e049 fixed diamond upgrade not mining obsidian 2017-03-30 00:54:29 -04:00
Mohammad-Ali Minaie
f392dc41e3 added tool deconstruct and repair, made tool modifiers actually work 2017-03-30 00:49:52 -04:00
Mohammad-Ali Minaie
2e9f271818 Tool Repair Implemented 2017-03-29 22:21:18 -04:00
Mohammad-Ali Minaie
beb6325ea0 add feature to to-do 2017-03-29 00:01:38 -04:00
Mohammad-Ali Minaie
019235f442 updating to-do 2017-03-27 21:00:36 -04:00
Mohammad-Ali Minaie
0b1ea6d95e Fixed StoneTongs and anvil cooperation, iron ingots can now be cooked 2017-03-26 12:52:18 -04:00
Mohammad-Ali Minaie
a8235c01d1 updating the anvil method 2017-03-26 02:38:47 -04:00
Mohammad-Ali Minaie
2df60f9bc3 updated release version 2017-03-25 22:57:53 -04:00