Commit Graph

556 Commits

Author SHA1 Message Date
7f9e5ad294 Merge branch 'crashfix-20170716' of nmd/ForgeCraft into master-1.11 2017-07-16 19:13:32 +00:00
srw
eb07701181 replace tag methods with NBTHelpers, fixes null point exception crash 2017-07-16 15:08:28 -04:00
Mohammad-Ali Minaie
6476b0aee1 update to fix bug with toolhead drop missing NBT 2017-07-15 14:30:13 -04:00
Mohammad-Ali Minaie
4e270cccc1 update to newest primal version 2017-07-08 18:25:59 -04:00
Mohammad-Ali Minaie
f9e546d66b oops wrong branch 2017-07-08 13:57:37 -04:00
Mohammad-Ali Minaie
25d426ff31 fixed item drop for item tool breaking and breaker not breaking 2017-07-06 06:28:28 -04:00
Mohammad-Ali Minaie
210c023f2b fixed bug where tool could be repaired for free 2017-07-05 22:25:00 -04:00
Mohammad-Ali Minaie
6744c4b22d fixed epic dup bug and added broken item drops for tools, ur still better off not breaking ur tool 2017-07-05 22:15:32 -04:00
Mohammad-Ali Minaie
d0a9606931 version bump 2017-07-04 21:29:39 -04:00
Mohammad-Ali Minaie
93374f71d9 fix bunch of shit 2017-07-04 21:28:53 -04:00
Mohammad-Ali Minaie
d597e3d2c6 fixed longbow bug 2017-07-03 23:43:24 -04:00
Mohammad-Ali Minaie
226eb7a62f fixing stonetongs bug unable to replicate switching all state flags to 2 2017-07-03 20:26:37 -04:00
Mohammad-Ali Minaie
3040b4cc52 merge longbow and version bump 2017-07-03 18:51:29 -04:00
Mohammad-Ali Minaie
256ea2b4db update sound 2017-07-03 18:47:11 -04:00
Mohammad-Ali Minaie
f3e71409fd finished feature arrow 2017-07-03 18:44:21 -04:00
Mohammad-Ali Minaie
4440c4bd19 tweaked recipes 2017-07-03 08:47:13 -04:00
Mohammad-Ali Minaie
034ab4b8d0 gotta go wash my hair 2017-07-03 00:20:17 -04:00
Mohammad-Ali Minaie
92e96fd13f commiting b4 going out 2017-07-02 16:39:54 -04:00
Mohammad-Ali Minaie
a3eac08572 not adding that shit file 2017-07-02 11:16:14 -04:00
Mohammad-Ali Minaie
ee788d0b35 fixed missing recipe and breaker bug 2017-06-27 22:20:55 -04:00
Mohammad-Ali Minaie
16868d3a1c lang file bug switch getVanillaBurnItemtime 2017-06-26 10:17:40 -04:00
Mohammad-Ali Minaie
49007061d0 1.12 update 2017-06-26 00:19:38 -04:00
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