Commit Graph

23 Commits

Author SHA1 Message Date
Fluid1C3
0eccc1bcf7 Merging 2015-08-15 20:10:11 -05: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
Fluid1C3
a6263542e9 Test 2015-08-11 19:23:40 -05:00
Fluid1C3
27c951fcde Merge branch 'DEV' of ssh://git.nmd.so:12000/kitsu/nmdenergy into DEV
Fluid weird

Conflicts:
	src/main/java/nmd/primal/energy/Main.java
2015-08-11 19:15:11 -05:00
Fluid1C3
aa7ef158b8 Fluidizing this beotch 2015-08-11 18:57:06 -05:00
KitsuShadow
71867cff5f preInit and PostInit 2015-08-11 19:39:33 -04:00
Fluid1C3
d6957a81a7 Fluid comment 2015-08-11 18:35:19 -05:00
KitsuShadow
e6851f9b94 Package Rename 2015-08-11 19:14:10 -04:00
KitsuShadow
6a8fd8f798 Initial 2015-08-11 19:02:55 -04:00