Commit Graph

2843 Commits

Author SHA1 Message Date
fullwall
b57cd60285 Remerge 2012-02-28 22:33:38 +08:00
fullwall
5e2ea74f1b Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:30:26 +08:00
fullwall
8cb6fa9862 Change to pathfinding 2012-02-28 22:30:02 +08:00
aPunch
f339368367 equip fix 2012-02-28 08:29:40 -06:00
fullwall
6b4bbc62ed Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:18:24 +08:00
fullwall
f89aac853d Fix some bugs 2012-02-28 22:17:49 +08:00
aPunch
03725cba9b color change 2012-02-28 07:47:44 -06:00
aPunch
3ca49572f9 fix 2012-02-28 07:27:33 -06:00
fullwall
816545cf59 Move file 2012-02-28 21:03:36 +08:00
fullwall
056e0a920d Merge 2012-02-28 20:39:18 +08:00
fullwall
c741cf08d6 Minor change 2012-02-28 20:38:08 +08:00
aPunch
9fd75d10bf ... 2012-02-28 06:22:20 -06:00
aPunch
f6b7bfe816 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 06:18:57 -06:00
aPunch
744eab6953 fix more bugs 2012-02-28 06:18:19 -06:00
fullwall
96ea7fe363 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 20:11:37 +08:00
fullwall
d1fc04e9ec Fix logic 2012-02-28 20:11:25 +08:00
aPunch
1bb90ae533 fix another bug 2012-02-28 06:09:40 -06:00
aPunch
f6f655b15c fix duping bug 2012-02-28 05:53:47 -06:00
fullwall
a795111e1d Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 19:28:16 +08:00
fullwall
f42248a38e Bugfix (may need changing later) 2012-02-28 19:25:42 +08:00
aPunch
25ad97f37e finished equipment editor 2012-02-28 04:46:28 -06:00
aPunch
bf7b868a09 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 01:42:23 -06:00
aPunch
5d56f6edc4 added save command 2012-02-28 01:41:15 -06:00
fullwall
bb37e033b9 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 15:39:21 +08:00
fullwall
5f8c8aafc3 Bugfix 2012-02-28 15:39:00 +08:00
aPunch
c188d2833e editor changes, bug fixes 2012-02-27 09:59:39 -06:00
aPunch
a4b1858c3a changes 2012-02-27 09:21:28 -06:00
fullwall
164d7467ad Minor change to Editor 2012-02-27 22:35:54 +08:00
fullwall
0ef4192769 Remove derp! 2012-02-27 21:42:34 +08:00
fullwall
abcf43dd9f Fix build 2012-02-27 21:19:40 +08:00
fullwall
7bd412f646 Properly register character 2012-02-27 21:13:46 +08:00
fullwall
6972dba611 Add temporary testing character 2012-02-27 21:01:38 +08:00
fullwall
ccf0b14547 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-27 19:17:10 +08:00
fullwall
965277121d Waypoint work 2012-02-27 19:16:01 +08:00
aPunch
5e5fb2af4c added reload command - do not use /reload 2012-02-27 04:59:33 -06:00
aPunch
55ec6d374e revert 2012-02-27 04:12:07 -06:00
aPunch
acf0fe15b1 added mob type requirement to commands 2012-02-27 02:32:43 -06:00
aPunch
120003b4cd have set size for slimes/magma cubes, override chicken egg-laying 2012-02-26 21:12:14 -06:00
aPunch
8b32f746a4 change to remove command 2012-02-26 10:19:57 -06:00
aPunch
d3080933ac change version 2012-02-26 03:47:57 -06:00
aPunch
4fc109d9ed added owner command, fixed help menu bug 2012-02-26 03:42:55 -06:00
aPunch
42fc929605 Merge pull request #8 from simplyianm/master
Maven fix
2012-02-25 23:30:56 -08:00
Ian Macali
670d999bfe Fixed Maven. 2012-02-26 01:20:11 -06:00
aPunch
c6e917d243 attempt to fix more world issues 2012-02-26 00:35:44 -06:00
aPunch
17b695bf9d listen to world unloading and loading 2012-02-25 23:23:43 -06:00
aPunch
bb5268f641 added license 2012-02-25 04:20:58 -06:00
aPunch
d6dedc8858 command and permission fixes 2012-02-25 01:57:04 -06:00
aPunch
35dc3ce40a changes to editors 2012-02-25 00:07:53 -06:00
aPunch
edcdcf1aec update to use EntityType instead of CreatureType 2012-02-23 17:45:45 -06:00
aPunch
1e8f9de47d format README 2012-02-23 05:23:04 -06:00