Commit Graph

334 Commits

Author SHA1 Message Date
Mohammad-Ali Minaie
b8b80fb547 Merge branch 'master' into master-1.12 2017-06-25 22:50:14 -04:00
Mohammad-Ali Minaie
3928deeb7b moved 1.11 to kfc 2017-06-25 22:49:46 -04:00
Mohammad-Ali Minaie
3a40744de2 tryd to update gotta wait 2017-06-25 22:47:48 -04:00
Mohammad-Ali Minaie
3e1afd631b init to 1.12 2017-06-25 22:34:06 -04:00
Mohammad-Ali Minaie
e86fa3f518 master commit 2017-06-25 22:25:54 -04:00
Mohammad-Ali Minaie
0189c176df prepping for update 2017-06-25 16:29:51 -04:00
Mohammad-Ali Minaie
69b25b37ff i think ready for update 2017-06-25 14:58:57 -04:00
Mohammad-Ali Minaie
27e670e537 all the assets, casting recipes, bloomery recipes and tweaks, upgrades done 2017-06-25 03:42:41 -04:00
Mohammad-Ali Minaie
42f1621fea bronze assets finished, bronze casting finished 2017-06-24 16:04:20 -04:00
Mohammad-Ali Minaie
c2a22770f7 more casting stuff, need to make the actual tool parts and tools 2017-06-24 04:19:17 -04:00
Mohammad-Ali Minaie
c21ca30137 maded assets for pickcast added crafting handler and drying state 2017-06-22 22:45:28 -04:00
Mohammad-Ali Minaie
6fc8485f82 crafting twerk for diamond and emerald 2017-06-22 16:12:31 -04:00
Mohammad-Ali Minaie
e948ec99c9 casting crafting, say that 5 times fast 2017-06-22 16:09:57 -04:00
Mohammad-Ali Minaie
10b7e8d75b updated models and slot code, need to add recipe handler 2017-06-21 09:01:26 -04:00
Mohammad-Ali Minaie
431b93bf31 fixed bugs initial slot manager handler for casting added 2017-06-20 22:41:18 -04:00
Mohammad-Ali Minaie
53680a59c8 gettig ready to make tesr 2017-06-20 16:18:06 -04:00
Mohammad-Ali Minaie
4d33953135 model issues and refactoring 2017-06-19 07:55:57 -04:00
Mohammad-Ali Minaie
5305247683 getting ready for casting feature 2017-06-19 05:41:05 -04:00
Mohammad-Ali Minaie
b832af808f fixed merge conflicts 2017-06-18 15:55:01 -04:00
Mohammad-Ali Minaie
8aefcbbf09 finished adobe brick bloom and forge blocks, refactored forge, bloomery, and anvil 2017-06-18 15:51:01 -04:00
Mohammad-Ali Minaie
4e5ada44cf adobe forge, adobe bloomery, refactor forge bloomery stonetongs 2017-06-18 14:35:20 -04:00
Mohammad-Ali Minaie
9a607d5abd need to do adobe bloomery item model and update brick bloomery model 2017-06-18 05:10:47 -04:00
Mohammad-Ali Minaie
e72f91d3ac pushing changes i made in the wrong branch 2017-06-18 01:23:08 -04:00
Mohammad-Ali Minaie
f503570db7 pushing to ull new branch 2017-06-14 21:39:11 -04:00
Mohammad-Ali Minaie
d1b0d02131 fixed ingot dupe bug 2017-06-12 15:30:57 -04:00
Mohammad-Ali Minaie
8f30ff4e96 commiting b4 switch to bugfix branch 2017-06-12 15:08:31 -04:00
Mohammad-Ali Minaie
350461ee1c updating before system restart 2017-06-11 21:27:13 -04:00
Mohammad-Ali Minaie
f11bc16690 Merge branch 'master' of ssh://git.nmd.so:12000/nmd/ForgeCraft 2017-06-11 21:09:49 -04:00
37a8321d87 Merge branch 'configfile' of nmd/ForgeCraft into master 2017-06-12 01:09:04 +00:00
9f5a391539 Basic config file 2017-06-11 18:04:51 -07:00
Mohammad-Ali Minaie
407eceafa4 fixed anvil to not drop hot things 2017-06-11 18:46:11 -04:00
Mohammad-Ali Minaie
8ae050bddd all the bug fixes, refactoring, and feauture upgrades 2017-06-11 17:42:50 -04:00
Mohammad-Ali Minaie
b7d2b6580a working on block breaker 2017-06-11 02:13:27 -04:00
Mohammad-Ali Minaie
981d117f3d anvil rendering updates, anvil handler to reduce code localization, tong items now have IDs associated to the item registration to make matching them easier 2017-06-11 01:44:30 -04:00
Mohammad-Ali Minaie
7f6d9616ba fixing it so you can't crash urself like a dumb dumb 2017-06-10 17:33:36 -04:00
Mohammad Minaie
2f0dbfa973 Merge pull request #12 from kitsushadow/test
fixing makeSmoke missing dependencies
2017-06-10 02:02:26 -04:00
Zainkai
d30ec80218 fixing makeSmoke missing dependencies 2017-06-09 23:00:36 -07:00
Zainkai
f9e8ba52ad deleting unnessary test file 2017-06-09 22:31:20 -07:00
Zainkai
7934f8ba65 testing 2017-06-09 22:25:33 -07:00
Mohammad-Ali Minaie
f7cb26afec updated gitignore 2017-06-10 01:08:35 -04:00
Mohammad-Ali Minaie
56439512b6 primal version update 2017-05-29 14:49:41 -04:00
Mohammad-Ali Minaie
fabc149a77 updating render classes to fix bugs when breaking blocks 2017-05-29 14:24:01 -04:00
Mohammad-Ali Minaie
2764cae3e9 updating dependendency check and version 2017-04-23 14:26:25 -04:00
Mohammad-Ali Minaie
82ad6a4bb5 update version 2017-04-22 20:39:37 -04:00
Mohammad Minaie
6a8d055bc2 Merge pull request #10 from kitsushadow/featureMoreIron
Feature more iron
2017-04-22 20:35:47 -04:00
Mohammad-Ali Minaie
d7e858ab42 preparing for release 2017-04-22 20:29:16 -04:00
Mohammad-Ali Minaie
6b37415e8d Merge branch 'master' into featureMoreIron 2017-04-22 15:03:29 -04:00
Mohammad-Ali Minaie
f457853687 updating to new primal version 2017-04-22 15:02:48 -04:00
Mohammad-Ali Minaie
2539ca1883 abstract bloomery input 2017-04-22 14:56:41 -04:00
Mohammad-Ali Minaie
b4689906b7 fixed crafting issue but anvil and forge rendering is broken 2017-04-20 06:08:19 -04:00