Commit Graph

393 Commits

Author SHA1 Message Date
fullwall
133bf796b5 Remerge 2012-02-28 22:33:38 +08:00
fullwall
bb93032410 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:30:26 +08:00
fullwall
4191705cce Change to pathfinding 2012-02-28 22:30:02 +08:00
aPunch
f782850964 equip fix 2012-02-28 08:29:40 -06:00
fullwall
50b98ae39e Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:18:24 +08:00
fullwall
91de970bc0 Fix some bugs 2012-02-28 22:17:49 +08:00
aPunch
ee78e9981e color change 2012-02-28 07:47:44 -06:00
aPunch
f10944db9c fix 2012-02-28 07:27:33 -06:00
fullwall
cf5017644b Move file 2012-02-28 21:03:36 +08:00
fullwall
3a637dd234 Merge 2012-02-28 20:39:18 +08:00
fullwall
59dee87f38 Minor change 2012-02-28 20:38:08 +08:00
aPunch
7887cc8a7d ... 2012-02-28 06:22:20 -06:00
aPunch
6847b6dee2 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 06:18:57 -06:00
aPunch
c086e78ac2 fix more bugs 2012-02-28 06:18:19 -06:00
fullwall
333c4e35b4 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 20:11:37 +08:00
fullwall
e7cc81e44e Fix logic 2012-02-28 20:11:25 +08:00
aPunch
7ba3eac7fa fix another bug 2012-02-28 06:09:40 -06:00
aPunch
bb316d5af8 fix duping bug 2012-02-28 05:53:47 -06:00
fullwall
a6991c2dc2 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 19:28:16 +08:00
fullwall
517736403b Bugfix (may need changing later) 2012-02-28 19:25:42 +08:00
aPunch
42f9c0a07e finished equipment editor 2012-02-28 04:46:28 -06:00
aPunch
59ec5c4154 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 01:42:23 -06:00
aPunch
93cb0010ff added save command 2012-02-28 01:41:15 -06:00
fullwall
6b9004b142 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 15:39:21 +08:00
fullwall
1f74e7c244 Bugfix 2012-02-28 15:39:00 +08:00
aPunch
1bbe64181d editor changes, bug fixes 2012-02-27 09:59:39 -06:00
aPunch
410e227285 changes 2012-02-27 09:21:28 -06:00
fullwall
0d3d667f19 Minor change to Editor 2012-02-27 22:35:54 +08:00
fullwall
932c561a85 Remove derp! 2012-02-27 21:42:34 +08:00
fullwall
e46b9ce1a6 Fix build 2012-02-27 21:19:40 +08:00
fullwall
081c481036 Properly register character 2012-02-27 21:13:46 +08:00
fullwall
e600bdc7e2 Add temporary testing character 2012-02-27 21:01:38 +08:00
fullwall
b4089dc36a Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-27 19:17:10 +08:00
fullwall
75e718033a Waypoint work 2012-02-27 19:16:01 +08:00
aPunch
c77d5cb431 added reload command - do not use /reload 2012-02-27 04:59:33 -06:00
aPunch
bba2114f17 revert 2012-02-27 04:12:07 -06:00
aPunch
2e24b5b60f added mob type requirement to commands 2012-02-27 02:32:43 -06:00
aPunch
e5994c562c have set size for slimes/magma cubes, override chicken egg-laying 2012-02-26 21:12:14 -06:00
aPunch
63aec0d2dc change to remove command 2012-02-26 10:19:57 -06:00
aPunch
1c3655c9c6 change version 2012-02-26 03:47:57 -06:00
aPunch
9da9c6c806 added owner command, fixed help menu bug 2012-02-26 03:42:55 -06:00
aPunch
05acb6d50a Merge pull request #8 from simplyianm/master
Maven fix
2012-02-25 23:30:56 -08:00
Ian Macali
3feb24b8c3 Fixed Maven. 2012-02-26 01:20:11 -06:00
aPunch
31cd3b8718 attempt to fix more world issues 2012-02-26 00:35:44 -06:00
aPunch
afc36bd307 listen to world unloading and loading 2012-02-25 23:23:43 -06:00
aPunch
c5fecea90b added license 2012-02-25 04:20:58 -06:00
aPunch
c2491d2df0 command and permission fixes 2012-02-25 01:57:04 -06:00
aPunch
100f256dcc changes to editors 2012-02-25 00:07:53 -06:00
aPunch
7dcb76d755 update to use EntityType instead of CreatureType 2012-02-23 17:45:45 -06:00
aPunch
9648dcb7b9 format README 2012-02-23 05:23:04 -06:00