d23b8e0c7c
1795 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Tiger Wang
|
d23b8e0c7c |
Merge pull request #77 from tonibm19/patch-1
Now Endermans spawn in The End |
||
|
Tiger Wang
|
b48651a034 | Really removed comments this time | ||
tonibm19
|
67351d7d7b | Now Endermans spawn in The End | ||
|
Tiger Wang
|
1599d607d1 |
Merge pull request #74 from tigerw/master
Further attempt at fixing torch placements |
||
Alexander Harkness
|
a9359086ef |
Dragged in the latest core changes.
Squashed commit of the following:
commit 735f1dac5e0d5a9d98dd2e0b5833e01d925487a0
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 19:42:42 2013 +0100
Re-added the downfall command.
commit 9dc3f0d18af4a411f8a40b525e49e7598159f450
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:46:05 2013 +0100
Alpha-sorted the command bindings.
commit e22d2fcf3dd840b1a051f3b5b529040213c151c6
Merge: 3ff68e9 9e285ea
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:35:46 2013 +0100
Merge branch 'vanilla-commands'
Conflicts:
main.lua
weather.lua
commit 3ff68e9690ff365fd57343dd8d0609bdc6b6bb54
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:22:33 2013 +0100
Cleaned up some files and also killed some demons that had survived
the messaging update.
commit 9e285ea6ceb3f2e279052fd10227a6dfeb48c062
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 15:09:28 2013 +0100
Fixed tabs and conforms to standards
commit e092a35988074b7ebd58068c0b24a235a98596df
Merge: f4038d2 c1c563b
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:06:35 2013 +0100
Merge branch 'message-standards'
Conflicts:
console.lua
item.lua
main.lua
commit d68c84b8b74a54cc15965036d27ad0b1dde2d603
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:56:08 2013 +0100
Added /msg alias
commit c1c563bda69d51cf5454c7584a25fa3968f0e3ad
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:55:56 2013 +0100
Cleaned up console a little and switched to new message system.
Also fixed missing eof newline.
commit dc6c5fafc32034321f6827b0c21e99212e2d559b
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:54:47 2013 +0100
Cleaned up web-perms and switched to new message system.
Also added missing eof newline.
commit f739fc83ace22cf1ee966ad5514bd3c708d08c20
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:54:10 2013 +0100
Remove command
commit dc5ce476e871b425f79e510522e35db5608161d4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:52:40 2013 +0100
Now conforms to chat standards
commit 41e15803541f4a20ee5baf92106e2ba1cb40cbd7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:51:21 2013 +0100
Cleaned up weather and switched to new message system.
Also added missing eof newline.
commit d19caacaad67addaa30d1b6f48ec47c265b4832e
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:50:07 2013 +0100
Cleaned up viewdistance and switched to new messaging system.
Also added missing eof newline.
commit d6f6603773ae7beb87cb951988e7738ba9c1e538
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:48:34 2013 +0100
Cleaned up top and changed to new messaging system.
Also fixed missing eof newline.
commit f50fb793a1332c1cc87b3c6e0dfa283f9dfc9e61
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:47:28 2013 +0100
Cleaned up the time file and switched to new messaging system.
commit aff076175ded4823da817547349537f3c33d4a43
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:43:38 2013 +0100
Now comforms to help standards
commit 4c416d1d1944fa00d4bf07f2580b29b530545bb3
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 14:09:29 2013 +0200
Added /tell [playername] [message]
commit 56db86812bfa7c4482b563af71846616a1716434
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 14:06:47 2013 +0200
Added /tell [playername] [message]
commit 1b5f32e3b577474b0878dfe9211cafbdb00790bb
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 12:58:53 2013 +0100
Cleaned up teleport and switched to new message system.
Also added missing eof newline.
commit fb96b73831679735a9677d7f520d19d8276a15d6
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 13:33:49 2013 +0200
Added /weather [Clear/Rain/Thunder]
commit 1e4676965a3ce6dc79912e0c8686b7de5026eb42
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 13:32:04 2013 +0200
Added /weather [Clear/Rain/Thunder]
commit f4038d2f9d748df54af054661a18630219ebd25c
Author: STRWarrior <niels.breuker@hotmail.nl>
Date: Sun Aug 11 13:08:24 2013 +0200
changed /downfall to /toggledownfall becouse thats the way it is in vanilla.
commit acdcefe61919e9ecbace1ee2f56dc24c94ffa4dc
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 13:02:35 2013 +0200
Fixed /tpa and /tpaccept
commit 9f526a63f07497fa7542515aa17afce9adc34abb
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 12:59:22 2013 +0200
Updated README (new commands added)
commit 717239095c638d86859f1b1b449e6bea0d093f02
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:37:11 2013 +0100
Cleaned up spawn.lua and changed to new message system.
Also fixed missing eof newline.
commit 2a6a693efcffa1145270bc79ce403e5038a88308
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:35:58 2013 +0100
Cleaned up the save-reload-stop file.
Also fixed missing eof newline.
commit d32223e4361509a598ee528261b113d92f402e7e
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:35:08 2013 +0100
Cleaned up the regen file and changed to the new message system.
Also fixed missing eof newline.
commit 7635e0cd1be051d60bbb6127f04b5b9b8decf51f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:30:47 2013 +0100
Cleaned up rank-groups.lua and changed to new message system.
Also fixed missing eof newline.
commit 204e38aa33541794745a671092a3b5b37388f6d2
Merge: 42e95a6 a319162
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 00:54:49 2013 -0700
Merge pull request #19 from mc-server/vanilla-commands
Added /kill and /clear
commit a31916277fcef2925fc96ce6833dac1ab7c62905
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 23:11:21 2013 +0200
You die if you dont specify a player
commit 0aca0d8431cc69f841a3e3f3a0ada81c1d8b1fbb
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 21:05:03 2013 +0100
Cleaned up the portal and worlds file and added new message system.
Also fixed missing eof newline.
commit 9f4a1fe0ef18a3ee48ea5629969854e5a60616a0
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 21:01:23 2013 +0100
Cleaned up plugins file and added new message system.
also fixed missing eof newline.
commit 9f04dfef81e8705597aac8fbc8912e3c3b9be6e8
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:23:41 2013 +0200
fixed /clear
commit 13e9007844f15050ad4ecea79246d31426975898
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 20:17:06 2013 +0100
Cleaned up the motd file.
commit 6c8de9b3594221fbb092d9989166826754641eda
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:13:42 2013 +0200
Added /clear command
commit 97fe00aac1bf7d497e08a9622bb32786d64b4c0b
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:11:31 2013 +0200
Added /clear command
commit 8dec3c04acb9814db1c89cba2094494fd321e40a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 20:11:26 2013 +0100
Cleaned up the me file and changed to new message system.
commit 72c401fe65589adce446e7de59b3c47ac2147fc9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 20:09:26 2013 +0100
Cleaned up the main file, and changed to the new message system.
commit c48604becd8da56590c9374a641a665d1d6dedab
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:05:24 2013 +0200
Added /kill
commit 41b90ad60fc944aa307447491e511879e64f108a
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:03:47 2013 +0200
added /kill
commit b2ffcfb1ea36758b013e1ea85c2515485ed30543
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:57:50 2013 +0100
Added new messaging system to locate.lua.
Also added the eof newline.
commit 318e4dc85eb10d7d97279a19f2d21f3ec75c4598
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:53:51 2013 +0100
Cleaned up the kick command and added new message system.
Also fixed missing eof newline.
commit 3d864b47a826911181604f83ea72ca0416ff25ce
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:49:56 2013 +0100
Cleaned the /i a bit more.
commit 7c26e76048885e2cbc7bc5b57d6ba38b7475e2a5
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:48:19 2013 +0100
Changed to the new message system for /i. Also fixed eof newline.
commit 1bc7f1844942a4a675c125b06c81b418b009c037
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:37:35 2013 +0100
Cleaned up help massively and implemented the new messages.
Also added new eof newline.
commit 150c88ccfe2d6e5210f95c31e56f824832a0c98c
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:36:14 2013 +0100
Added spaces after the tag for the messages so the results look good.
commit a144b535cd51805ef8badfc6645aa654370913ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:30:21 2013 +0100
Added new messages to gm.lua.
Also added spaces in functions and added a eof newline.
commit 2237f62c1c6e40d7b2a2986916b2a6e1879f6bfd
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:23:29 2013 +0100
Removed a semicolon that was creeping around in the messages file.
commit fbe68a2c28f0b7d54d8527b54a737218bc9a6da4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:22:48 2013 +0100
Fixed derpy spelling and added new messages to the give command.
Also cleaned up the functions in the give command file.
commit 66b33c0436d084a2fed1248d63f074c768545ad0
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:04:55 2013 +0100
Added new messages to the ban and unban command.
Also cleaned up the function calls and added the eof newline.
commit c90dda25990de8ab6d529e83c9620d9bc8c9b9f1
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 17:56:43 2013 +0100
Added new messages to /back command.
Also fixed newline at end of file.
commit 42e95a6d32da7227a84a5202a2e72fcf4007aaf2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 17:04:36 2013 +0100
Fix concatenation issue
commit 7432c25306b8125fca13100048b693bebad92d3d
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:44:47 2013 +0100
Fix of bracket
commit 4e0b3f905e2f937951eebd322b204f8da3e745cd
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 16:38:53 2013 +0100
Fixed bugs in the console command file that were stopping it from working.
There was an extra `end` and an extra `)`
commit ea1215da739e65585b448103e0bf1bebec00dfac
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:06:30 2013 +0100
Fixed duplicate leave messages
commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132
Merge: b273df1 1a6f70f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 06:05:32 2013 -0700
Merge pull request #13 from mc-server/give-console
Added a console command for giving players items.
commit b273df17c759eba82342466cf6e2291d84b77ab3
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 08:27:14 2013 +0100
Hopefully fixed the /i command not working.
I had not defined the newSplit variable before using it.
commit 8a74037cc092d048364299f18e07c02c85ae3737
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:18:48 2013 +0100
Fixed the contributors not being on their own lines.
commit 57d842cbc61464a613c248d043a3fe7254d931a2
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:17:03 2013 +0100
Added temporary messages.lua, seeing if people like it.
commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:26:12 2013 +0100
Fix the README - fixes #15
commit cc438b3229cdb730d308479c59491b5e66130118
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:01:48 2013 +0100
Alpha-sort the console commands.
commit aa22f647c27d50b3ccf7e763927bd24329da3a56
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:00:44 2013 +0100
Alpha-sort the commands when they are bound.
commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab
Merge: a485101 01ccfaa
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:41:38 2013 -0700
Merge pull request #14 from mc-server/ireplace
Told the player receiving items what they are getting, and fixed the console log.
commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:39:36 2013 +0100
Told the player reveiving items what they are getting, and fixed the console log.
commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:35:48 2013 +0100
Added a console command for giving players items.
commit a4851010b2ff29bb55feb6331ea6ddec28532a0f
Merge: 0ffbd4a ba923e4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:01:47 2013 -0700
Merge pull request #12 from mc-server/ireplace
Re-implement the /i command and make /give conform to the vanilla standards
commit ba923e4764b6a3064be6aacea86e059828b2d0e6
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:59:53 2013 +0100
Added /item and made /i an alias of it.
commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:46:14 2013 +0100
Kept the stuff alpha-sorted.
commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:45:09 2013 +0100
Removed some extra semicolons.
commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:44:06 2013 +0100
Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good.
commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add
Author: tonibm19 <tonibm19@gmail.com>
Date: Wed Aug 7 13:52:02 2013 +0200
Fixed typo
commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Tue Aug 6 18:23:51 2013 +0100
Re-implement the /i command and make /give conform to the vanilla standards.
This commit is experimental and may fail. Please test it!
commit f4ac029a0f1903fc9e49365117a81293303c8811
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Aug 2 23:23:15 2013 +0100
Miscellaneous Changes
Reduced ban/unban code size a little.
Clarified console commands.
Added commented code to onjoin when bugs are fixed.
Removed embarrassing server wide messages.
commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date: Thu Aug 1 10:58:05 2013 -0700
Merge pull request #10 from mc-server/tabmix
Fix the inconsistency of spaces and tabs.
commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 1 16:47:15 2013 +0100
Changed everything to use the correct system of tabs.
commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed Jul 31 16:56:41 2013 +0100
Rewrote Info Messages + Implemented #7 [SEE DESC]
Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
[FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
Individual worlds have individual LimitWorld setting, with individual
WebAdmin setting as well.
commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 14:47:45 2013 +0100
Fix of nil value in SpawnProtect
commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:19:11 2013 +0100
Fixed potential SpawnProtect nil value issue
Now detects if PROTECTRADIUS is zero, and if so, cancels checks.
commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:07:50 2013 +0100
Enhanced SpawnProtect greatly (thanks xoft)
Wow. Who knew ~30 lines of code could become one?
commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 11:11:22 2013 +0100
Removed Development LOGINFOs
commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 10:40:57 2013 +0100
Implemented Issue #5 Enhancement [SEE DESC]
Made spawn protection configurable in each world's world file. World has
to be listed in settings.ini!
commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Jul 28 14:00:15 2013 +0100
Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master
Conflicts:
main.lua
commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:55:50 2013 +0100
Default WorldLimiter = Off
commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:47:24 2013 +0100
Fixed Potential WorldLimit & OnDisable Bugs
Changed WorldLimiter if detection from nil value to config boolean.
Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
a nil value. ??
commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date: Sat Jul 27 11:44:18 2013 -0700
Merge pull request #3 from tonibm19/master
Added /me command
commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:35:22 2013 +0200
Added /me command
commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:30:31 2013 +0200
Added /me command
commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:29:24 2013 +0200
added /me command
commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 09:01:45 2013 -0700
Merge pull request #2 from tigerw/master
Fixed /give descriptor & removed webadmin
commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 17:00:38 2013 +0100
Fixed /give descriptor & removed webadmin
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 08:51:45 2013 -0700
Merge pull request #1 from tigerw/master
Added TPA (tonibm9's fork)
commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 16:38:10 2013 +0100
Added TPA (tonibm9's fork)
With code from STR_Warrior.
commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 15:51:18 2013 +0100
Integrated SpawnProtect & Bugfixes [SEE DESC.]
Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
File and filename cleanup.
commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 23:14:40 2013 +0100
Update README.md
Added info.
commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 19:37:59 2013 +0100
Implemented Block Property checking for Collisions
Used g_BlockIsSolid, instead of checking data values.
commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 15:49:55 2013 +0100
Updated Files
Buildpermandcollision: updated collision code to check for torches and
redstone torches.
Help: attempt at always showing page number
Web_serversettings: attempt at introducing a check for Maximum Players
(must be above zero).
commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:46:08 2013 +0100
Update README.md
Extended 'GUI Redesign' section.
commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:43:00 2013 +0100
Update README.md
Added features and fixes and instructions for use.
commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:35:27 2013 +0100
Uploaded All Files
All Core files, both modified and unmodified.
commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 04:59:50 2013 -0700
Initial commit
|
||
madmaxoft
|
b58ca60815 | Added doxyComments for cIsThread. | ||
|
Alexander Harkness
|
cc708f757c |
Dragged in the latest changes for Core.
Squashed commit of the following:
commit 9dc3f0d18af4a411f8a40b525e49e7598159f450
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:46:05 2013 +0100
Alpha-sorted the command bindings.
commit e22d2fcf3dd840b1a051f3b5b529040213c151c6
Merge: 3ff68e9 9e285ea
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:35:46 2013 +0100
Merge branch 'vanilla-commands'
Conflicts:
main.lua
weather.lua
commit 3ff68e9690ff365fd57343dd8d0609bdc6b6bb54
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:22:33 2013 +0100
Cleaned up some files and also killed some demons that had survived
the messaging update.
commit 9e285ea6ceb3f2e279052fd10227a6dfeb48c062
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 15:09:28 2013 +0100
Fixed tabs and conforms to standards
commit e092a35988074b7ebd58068c0b24a235a98596df
Merge: f4038d2 c1c563b
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 15:06:35 2013 +0100
Merge branch 'message-standards'
Conflicts:
console.lua
item.lua
main.lua
commit d68c84b8b74a54cc15965036d27ad0b1dde2d603
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:56:08 2013 +0100
Added /msg alias
commit c1c563bda69d51cf5454c7584a25fa3968f0e3ad
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:55:56 2013 +0100
Cleaned up console a little and switched to new message system.
Also fixed missing eof newline.
commit dc6c5fafc32034321f6827b0c21e99212e2d559b
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:54:47 2013 +0100
Cleaned up web-perms and switched to new message system.
Also added missing eof newline.
commit f739fc83ace22cf1ee966ad5514bd3c708d08c20
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:54:10 2013 +0100
Remove command
commit dc5ce476e871b425f79e510522e35db5608161d4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:52:40 2013 +0100
Now conforms to chat standards
commit 41e15803541f4a20ee5baf92106e2ba1cb40cbd7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:51:21 2013 +0100
Cleaned up weather and switched to new message system.
Also added missing eof newline.
commit d19caacaad67addaa30d1b6f48ec47c265b4832e
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:50:07 2013 +0100
Cleaned up viewdistance and switched to new messaging system.
Also added missing eof newline.
commit d6f6603773ae7beb87cb951988e7738ba9c1e538
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:48:34 2013 +0100
Cleaned up top and changed to new messaging system.
Also fixed missing eof newline.
commit f50fb793a1332c1cc87b3c6e0dfa283f9dfc9e61
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 14:47:28 2013 +0100
Cleaned up the time file and switched to new messaging system.
commit aff076175ded4823da817547349537f3c33d4a43
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Aug 11 14:43:38 2013 +0100
Now comforms to help standards
commit 4c416d1d1944fa00d4bf07f2580b29b530545bb3
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 14:09:29 2013 +0200
Added /tell [playername] [message]
commit 56db86812bfa7c4482b563af71846616a1716434
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 14:06:47 2013 +0200
Added /tell [playername] [message]
commit 1b5f32e3b577474b0878dfe9211cafbdb00790bb
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 12:58:53 2013 +0100
Cleaned up teleport and switched to new message system.
Also added missing eof newline.
commit fb96b73831679735a9677d7f520d19d8276a15d6
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 13:33:49 2013 +0200
Added /weather [Clear/Rain/Thunder]
commit 1e4676965a3ce6dc79912e0c8686b7de5026eb42
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 13:32:04 2013 +0200
Added /weather [Clear/Rain/Thunder]
commit f4038d2f9d748df54af054661a18630219ebd25c
Author: STRWarrior <niels.breuker@hotmail.nl>
Date: Sun Aug 11 13:08:24 2013 +0200
changed /downfall to /toggledownfall becouse thats the way it is in vanilla.
commit acdcefe61919e9ecbace1ee2f56dc24c94ffa4dc
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 13:02:35 2013 +0200
Fixed /tpa and /tpaccept
commit 9f526a63f07497fa7542515aa17afce9adc34abb
Author: tonibm19 <tonibm19@gmail.com>
Date: Sun Aug 11 12:59:22 2013 +0200
Updated README (new commands added)
commit 717239095c638d86859f1b1b449e6bea0d093f02
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:37:11 2013 +0100
Cleaned up spawn.lua and changed to new message system.
Also fixed missing eof newline.
commit 2a6a693efcffa1145270bc79ce403e5038a88308
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:35:58 2013 +0100
Cleaned up the save-reload-stop file.
Also fixed missing eof newline.
commit d32223e4361509a598ee528261b113d92f402e7e
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:35:08 2013 +0100
Cleaned up the regen file and changed to the new message system.
Also fixed missing eof newline.
commit 7635e0cd1be051d60bbb6127f04b5b9b8decf51f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 11:30:47 2013 +0100
Cleaned up rank-groups.lua and changed to new message system.
Also fixed missing eof newline.
commit 204e38aa33541794745a671092a3b5b37388f6d2
Merge: 42e95a6 a319162
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Aug 11 00:54:49 2013 -0700
Merge pull request #19 from mc-server/vanilla-commands
Added /kill and /clear
commit a31916277fcef2925fc96ce6833dac1ab7c62905
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 23:11:21 2013 +0200
You die if you dont specify a player
commit 0aca0d8431cc69f841a3e3f3a0ada81c1d8b1fbb
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 21:05:03 2013 +0100
Cleaned up the portal and worlds file and added new message system.
Also fixed missing eof newline.
commit 9f4a1fe0ef18a3ee48ea5629969854e5a60616a0
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 21:01:23 2013 +0100
Cleaned up plugins file and added new message system.
also fixed missing eof newline.
commit 9f04dfef81e8705597aac8fbc8912e3c3b9be6e8
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:23:41 2013 +0200
fixed /clear
commit 13e9007844f15050ad4ecea79246d31426975898
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 20:17:06 2013 +0100
Cleaned up the motd file.
commit 6c8de9b3594221fbb092d9989166826754641eda
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:13:42 2013 +0200
Added /clear command
commit 97fe00aac1bf7d497e08a9622bb32786d64b4c0b
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:11:31 2013 +0200
Added /clear command
commit 8dec3c04acb9814db1c89cba2094494fd321e40a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 20:11:26 2013 +0100
Cleaned up the me file and changed to new message system.
commit 72c401fe65589adce446e7de59b3c47ac2147fc9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 20:09:26 2013 +0100
Cleaned up the main file, and changed to the new message system.
commit c48604becd8da56590c9374a641a665d1d6dedab
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:05:24 2013 +0200
Added /kill
commit 41b90ad60fc944aa307447491e511879e64f108a
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Aug 10 21:03:47 2013 +0200
added /kill
commit b2ffcfb1ea36758b013e1ea85c2515485ed30543
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:57:50 2013 +0100
Added new messaging system to locate.lua.
Also added the eof newline.
commit 318e4dc85eb10d7d97279a19f2d21f3ec75c4598
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:53:51 2013 +0100
Cleaned up the kick command and added new message system.
Also fixed missing eof newline.
commit 3d864b47a826911181604f83ea72ca0416ff25ce
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:49:56 2013 +0100
Cleaned the /i a bit more.
commit 7c26e76048885e2cbc7bc5b57d6ba38b7475e2a5
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 19:48:19 2013 +0100
Changed to the new message system for /i. Also fixed eof newline.
commit 1bc7f1844942a4a675c125b06c81b418b009c037
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:37:35 2013 +0100
Cleaned up help massively and implemented the new messages.
Also added new eof newline.
commit 150c88ccfe2d6e5210f95c31e56f824832a0c98c
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:36:14 2013 +0100
Added spaces after the tag for the messages so the results look good.
commit a144b535cd51805ef8badfc6645aa654370913ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:30:21 2013 +0100
Added new messages to gm.lua.
Also added spaces in functions and added a eof newline.
commit 2237f62c1c6e40d7b2a2986916b2a6e1879f6bfd
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:23:29 2013 +0100
Removed a semicolon that was creeping around in the messages file.
commit fbe68a2c28f0b7d54d8527b54a737218bc9a6da4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:22:48 2013 +0100
Fixed derpy spelling and added new messages to the give command.
Also cleaned up the functions in the give command file.
commit 66b33c0436d084a2fed1248d63f074c768545ad0
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 18:04:55 2013 +0100
Added new messages to the ban and unban command.
Also cleaned up the function calls and added the eof newline.
commit c90dda25990de8ab6d529e83c9620d9bc8c9b9f1
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 17:56:43 2013 +0100
Added new messages to /back command.
Also fixed newline at end of file.
commit 42e95a6d32da7227a84a5202a2e72fcf4007aaf2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 17:04:36 2013 +0100
Fix concatenation issue
commit 7432c25306b8125fca13100048b693bebad92d3d
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:44:47 2013 +0100
Fix of bracket
commit 4e0b3f905e2f937951eebd322b204f8da3e745cd
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 16:38:53 2013 +0100
Fixed bugs in the console command file that were stopping it from working.
There was an extra `end` and an extra `)`
commit ea1215da739e65585b448103e0bf1bebec00dfac
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:06:30 2013 +0100
Fixed duplicate leave messages
commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132
Merge: b273df1 1a6f70f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 06:05:32 2013 -0700
Merge pull request #13 from mc-server/give-console
Added a console command for giving players items.
commit b273df17c759eba82342466cf6e2291d84b77ab3
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 08:27:14 2013 +0100
Hopefully fixed the /i command not working.
I had not defined the newSplit variable before using it.
commit 8a74037cc092d048364299f18e07c02c85ae3737
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:18:48 2013 +0100
Fixed the contributors not being on their own lines.
commit 57d842cbc61464a613c248d043a3fe7254d931a2
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:17:03 2013 +0100
Added temporary messages.lua, seeing if people like it.
commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:26:12 2013 +0100
Fix the README - fixes #15
commit cc438b3229cdb730d308479c59491b5e66130118
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:01:48 2013 +0100
Alpha-sort the console commands.
commit aa22f647c27d50b3ccf7e763927bd24329da3a56
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:00:44 2013 +0100
Alpha-sort the commands when they are bound.
commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab
Merge: a485101 01ccfaa
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:41:38 2013 -0700
Merge pull request #14 from mc-server/ireplace
Told the player receiving items what they are getting, and fixed the console log.
commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:39:36 2013 +0100
Told the player reveiving items what they are getting, and fixed the console log.
commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:35:48 2013 +0100
Added a console command for giving players items.
commit a4851010b2ff29bb55feb6331ea6ddec28532a0f
Merge: 0ffbd4a ba923e4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:01:47 2013 -0700
Merge pull request #12 from mc-server/ireplace
Re-implement the /i command and make /give conform to the vanilla standards
commit ba923e4764b6a3064be6aacea86e059828b2d0e6
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:59:53 2013 +0100
Added /item and made /i an alias of it.
commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:46:14 2013 +0100
Kept the stuff alpha-sorted.
commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:45:09 2013 +0100
Removed some extra semicolons.
commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:44:06 2013 +0100
Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good.
commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add
Author: tonibm19 <tonibm19@gmail.com>
Date: Wed Aug 7 13:52:02 2013 +0200
Fixed typo
commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Tue Aug 6 18:23:51 2013 +0100
Re-implement the /i command and make /give conform to the vanilla standards.
This commit is experimental and may fail. Please test it!
commit f4ac029a0f1903fc9e49365117a81293303c8811
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Aug 2 23:23:15 2013 +0100
Miscellaneous Changes
Reduced ban/unban code size a little.
Clarified console commands.
Added commented code to onjoin when bugs are fixed.
Removed embarrassing server wide messages.
commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date: Thu Aug 1 10:58:05 2013 -0700
Merge pull request #10 from mc-server/tabmix
Fix the inconsistency of spaces and tabs.
commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 1 16:47:15 2013 +0100
Changed everything to use the correct system of tabs.
commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed Jul 31 16:56:41 2013 +0100
Rewrote Info Messages + Implemented #7 [SEE DESC]
Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
[FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
Individual worlds have individual LimitWorld setting, with individual
WebAdmin setting as well.
commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 14:47:45 2013 +0100
Fix of nil value in SpawnProtect
commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:19:11 2013 +0100
Fixed potential SpawnProtect nil value issue
Now detects if PROTECTRADIUS is zero, and if so, cancels checks.
commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:07:50 2013 +0100
Enhanced SpawnProtect greatly (thanks xoft)
Wow. Who knew ~30 lines of code could become one?
commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 11:11:22 2013 +0100
Removed Development LOGINFOs
commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 10:40:57 2013 +0100
Implemented Issue #5 Enhancement [SEE DESC]
Made spawn protection configurable in each world's world file. World has
to be listed in settings.ini!
commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Jul 28 14:00:15 2013 +0100
Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master
Conflicts:
main.lua
commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:55:50 2013 +0100
Default WorldLimiter = Off
commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:47:24 2013 +0100
Fixed Potential WorldLimit & OnDisable Bugs
Changed WorldLimiter if detection from nil value to config boolean.
Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
a nil value. ??
commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date: Sat Jul 27 11:44:18 2013 -0700
Merge pull request #3 from tonibm19/master
Added /me command
commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:35:22 2013 +0200
Added /me command
commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:30:31 2013 +0200
Added /me command
commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:29:24 2013 +0200
added /me command
commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 09:01:45 2013 -0700
Merge pull request #2 from tigerw/master
Fixed /give descriptor & removed webadmin
commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 17:00:38 2013 +0100
Fixed /give descriptor & removed webadmin
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 08:51:45 2013 -0700
Merge pull request #1 from tigerw/master
Added TPA (tonibm9's fork)
commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 16:38:10 2013 +0100
Added TPA (tonibm9's fork)
With code from STR_Warrior.
commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 15:51:18 2013 +0100
Integrated SpawnProtect & Bugfixes [SEE DESC.]
Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
File and filename cleanup.
commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 23:14:40 2013 +0100
Update README.md
Added info.
commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 19:37:59 2013 +0100
Implemented Block Property checking for Collisions
Used g_BlockIsSolid, instead of checking data values.
commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 15:49:55 2013 +0100
Updated Files
Buildpermandcollision: updated collision code to check for torches and
redstone torches.
Help: attempt at always showing page number
Web_serversettings: attempt at introducing a check for Maximum Players
(must be above zero).
commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:46:08 2013 +0100
Update README.md
Extended 'GUI Redesign' section.
commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:43:00 2013 +0100
Update README.md
Added features and fixes and instructions for use.
commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:35:27 2013 +0100
Uploaded All Files
All Core files, both modified and unmodified.
commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 04:59:50 2013 -0700
Initial commit
|
||
|
Tiger Wang
|
93f5a4388c | Removed unneeded case clause | ||
|
madmaxoft
|
dd60f55bcc |
Added the OnHopperPullingItem and OnHopperPushingItem hooks.
Requested in FS 412, slightly modified the params. |
||
|
madmaxoft
|
d97b4463c6 | Added an AllowEmptyStacks param to cItemGrid::HowManyCanFit(). | ||
|
Tiger Wang
|
e7ecd78312 | Tried adding bracket | ||
|
Tiger Wang
|
baae26ab22 |
Further attempt at fixing torch placements
Also fixed block on flower placement. #71 |
||
|
madmaxoft
|
deeb3a15dc |
Added OnPlayerAnimation() hook.
Initial patch by @STR_Warrior, updated to account for different animation packets. |
||
|
Tiger Wang
|
7e288850b1 |
Attempt at fixing torch placement
Attempt at fixing #71 and placement of torches. |
||
|
Alexander Harkness
|
7d6bde3d93 | Added back the required extra line in player.cpp | ||
|
Tiger Wang
|
b999b27e05 |
Removed extra disconnect message
There seems to be already one in the HandleDisconnect hook function. |
||
|
Alexander Harkness
|
83eb5cf419 |
Dragged in the latest core changes - got to automate this sometime.
Squashed commit of the following:
commit 42e95a6d32da7227a84a5202a2e72fcf4007aaf2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 17:04:36 2013 +0100
Fix concatenation issue
commit 7432c25306b8125fca13100048b693bebad92d3d
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:44:47 2013 +0100
Fix of bracket
commit 4e0b3f905e2f937951eebd322b204f8da3e745cd
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 16:38:53 2013 +0100
Fixed bugs in the console command file that were stopping it from working.
There was an extra `end` and an extra `)`
commit ea1215da739e65585b448103e0bf1bebec00dfac
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:06:30 2013 +0100
Fixed duplicate leave messages
commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132
Merge: b273df1 1a6f70f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 06:05:32 2013 -0700
Merge pull request #13 from mc-server/give-console
Added a console command for giving players items.
commit b273df17c759eba82342466cf6e2291d84b77ab3
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 08:27:14 2013 +0100
Hopefully fixed the /i command not working.
I had not defined the newSplit variable before using it.
commit 8a74037cc092d048364299f18e07c02c85ae3737
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:18:48 2013 +0100
Fixed the contributors not being on their own lines.
commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:26:12 2013 +0100
Fix the README - fixes #15
commit cc438b3229cdb730d308479c59491b5e66130118
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:01:48 2013 +0100
Alpha-sort the console commands.
commit aa22f647c27d50b3ccf7e763927bd24329da3a56
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:00:44 2013 +0100
Alpha-sort the commands when they are bound.
commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab
Merge: a485101 01ccfaa
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:41:38 2013 -0700
Merge pull request #14 from mc-server/ireplace
Told the player receiving items what they are getting, and fixed the console log.
commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:39:36 2013 +0100
Told the player reveiving items what they are getting, and fixed the console log.
commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:35:48 2013 +0100
Added a console command for giving players items.
commit a4851010b2ff29bb55feb6331ea6ddec28532a0f
Merge: 0ffbd4a ba923e4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:01:47 2013 -0700
Merge pull request #12 from mc-server/ireplace
Re-implement the /i command and make /give conform to the vanilla standards
commit ba923e4764b6a3064be6aacea86e059828b2d0e6
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:59:53 2013 +0100
Added /item and made /i an alias of it.
commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:46:14 2013 +0100
Kept the stuff alpha-sorted.
commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:45:09 2013 +0100
Removed some extra semicolons.
commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:44:06 2013 +0100
Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good.
commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add
Author: tonibm19 <tonibm19@gmail.com>
Date: Wed Aug 7 13:52:02 2013 +0200
Fixed typo
commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Tue Aug 6 18:23:51 2013 +0100
Re-implement the /i command and make /give conform to the vanilla standards.
This commit is experimental and may fail. Please test it!
commit f4ac029a0f1903fc9e49365117a81293303c8811
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Aug 2 23:23:15 2013 +0100
Miscellaneous Changes
Reduced ban/unban code size a little.
Clarified console commands.
Added commented code to onjoin when bugs are fixed.
Removed embarrassing server wide messages.
commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date: Thu Aug 1 10:58:05 2013 -0700
Merge pull request #10 from mc-server/tabmix
Fix the inconsistency of spaces and tabs.
commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 1 16:47:15 2013 +0100
Changed everything to use the correct system of tabs.
commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed Jul 31 16:56:41 2013 +0100
Rewrote Info Messages + Implemented #7 [SEE DESC]
Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
[FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
Individual worlds have individual LimitWorld setting, with individual
WebAdmin setting as well.
commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 14:47:45 2013 +0100
Fix of nil value in SpawnProtect
commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:19:11 2013 +0100
Fixed potential SpawnProtect nil value issue
Now detects if PROTECTRADIUS is zero, and if so, cancels checks.
commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:07:50 2013 +0100
Enhanced SpawnProtect greatly (thanks xoft)
Wow. Who knew ~30 lines of code could become one?
commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 11:11:22 2013 +0100
Removed Development LOGINFOs
commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 10:40:57 2013 +0100
Implemented Issue #5 Enhancement [SEE DESC]
Made spawn protection configurable in each world's world file. World has
to be listed in settings.ini!
commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Jul 28 14:00:15 2013 +0100
Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master
Conflicts:
main.lua
commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:55:50 2013 +0100
Default WorldLimiter = Off
commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:47:24 2013 +0100
Fixed Potential WorldLimit & OnDisable Bugs
Changed WorldLimiter if detection from nil value to config boolean.
Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
a nil value. ??
commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date: Sat Jul 27 11:44:18 2013 -0700
Merge pull request #3 from tonibm19/master
Added /me command
commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:35:22 2013 +0200
Added /me command
commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:30:31 2013 +0200
Added /me command
commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:29:24 2013 +0200
added /me command
commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 09:01:45 2013 -0700
Merge pull request #2 from tigerw/master
Fixed /give descriptor & removed webadmin
commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 17:00:38 2013 +0100
Fixed /give descriptor & removed webadmin
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 08:51:45 2013 -0700
Merge pull request #1 from tigerw/master
Added TPA (tonibm9's fork)
commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 16:38:10 2013 +0100
Added TPA (tonibm9's fork)
With code from STR_Warrior.
commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 15:51:18 2013 +0100
Integrated SpawnProtect & Bugfixes [SEE DESC.]
Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
File and filename cleanup.
commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 23:14:40 2013 +0100
Update README.md
Added info.
commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 19:37:59 2013 +0100
Implemented Block Property checking for Collisions
Used g_BlockIsSolid, instead of checking data values.
commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 15:49:55 2013 +0100
Updated Files
Buildpermandcollision: updated collision code to check for torches and
redstone torches.
Help: attempt at always showing page number
Web_serversettings: attempt at introducing a check for Maximum Players
(must be above zero).
commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:46:08 2013 +0100
Update README.md
Extended 'GUI Redesign' section.
commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:43:00 2013 +0100
Update README.md
Added features and fixes and instructions for use.
commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:35:27 2013 +0100
Uploaded All Files
All Core files, both modified and unmodified.
commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 04:59:50 2013 -0700
Initial commit
|
||
|
Tiger Wang
|
7035dbd7f1 |
Deleting cPlayer now does LOGD instead of LOG
Hopefully only prints in debug the debug message! |
||
|
Alexander Harkness
|
b8dee6c6f2 |
Merged in another fix for core...
Squashed commit of the following:
commit 7432c25306b8125fca13100048b693bebad92d3d
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:44:47 2013 +0100
Fix of bracket
commit 4e0b3f905e2f937951eebd322b204f8da3e745cd
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 16:38:53 2013 +0100
Fixed bugs in the console command file that were stopping it from working.
There was an extra `end` and an extra `)`
commit ea1215da739e65585b448103e0bf1bebec00dfac
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:06:30 2013 +0100
Fixed duplicate leave messages
commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132
Merge: b273df1 1a6f70f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 06:05:32 2013 -0700
Merge pull request #13 from mc-server/give-console
Added a console command for giving players items.
commit b273df17c759eba82342466cf6e2291d84b77ab3
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 08:27:14 2013 +0100
Hopefully fixed the /i command not working.
I had not defined the newSplit variable before using it.
commit 8a74037cc092d048364299f18e07c02c85ae3737
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:18:48 2013 +0100
Fixed the contributors not being on their own lines.
commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:26:12 2013 +0100
Fix the README - fixes #15
commit cc438b3229cdb730d308479c59491b5e66130118
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:01:48 2013 +0100
Alpha-sort the console commands.
commit aa22f647c27d50b3ccf7e763927bd24329da3a56
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:00:44 2013 +0100
Alpha-sort the commands when they are bound.
commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab
Merge: a485101 01ccfaa
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:41:38 2013 -0700
Merge pull request #14 from mc-server/ireplace
Told the player receiving items what they are getting, and fixed the console log.
commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:39:36 2013 +0100
Told the player reveiving items what they are getting, and fixed the console log.
commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:35:48 2013 +0100
Added a console command for giving players items.
commit a4851010b2ff29bb55feb6331ea6ddec28532a0f
Merge: 0ffbd4a ba923e4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:01:47 2013 -0700
Merge pull request #12 from mc-server/ireplace
Re-implement the /i command and make /give conform to the vanilla standards
commit ba923e4764b6a3064be6aacea86e059828b2d0e6
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:59:53 2013 +0100
Added /item and made /i an alias of it.
commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:46:14 2013 +0100
Kept the stuff alpha-sorted.
commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:45:09 2013 +0100
Removed some extra semicolons.
commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:44:06 2013 +0100
Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good.
commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add
Author: tonibm19 <tonibm19@gmail.com>
Date: Wed Aug 7 13:52:02 2013 +0200
Fixed typo
commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Tue Aug 6 18:23:51 2013 +0100
Re-implement the /i command and make /give conform to the vanilla standards.
This commit is experimental and may fail. Please test it!
commit f4ac029a0f1903fc9e49365117a81293303c8811
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Aug 2 23:23:15 2013 +0100
Miscellaneous Changes
Reduced ban/unban code size a little.
Clarified console commands.
Added commented code to onjoin when bugs are fixed.
Removed embarrassing server wide messages.
commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date: Thu Aug 1 10:58:05 2013 -0700
Merge pull request #10 from mc-server/tabmix
Fix the inconsistency of spaces and tabs.
commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 1 16:47:15 2013 +0100
Changed everything to use the correct system of tabs.
commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed Jul 31 16:56:41 2013 +0100
Rewrote Info Messages + Implemented #7 [SEE DESC]
Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
[FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
Individual worlds have individual LimitWorld setting, with individual
WebAdmin setting as well.
commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 14:47:45 2013 +0100
Fix of nil value in SpawnProtect
commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:19:11 2013 +0100
Fixed potential SpawnProtect nil value issue
Now detects if PROTECTRADIUS is zero, and if so, cancels checks.
commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:07:50 2013 +0100
Enhanced SpawnProtect greatly (thanks xoft)
Wow. Who knew ~30 lines of code could become one?
commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 11:11:22 2013 +0100
Removed Development LOGINFOs
commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 10:40:57 2013 +0100
Implemented Issue #5 Enhancement [SEE DESC]
Made spawn protection configurable in each world's world file. World has
to be listed in settings.ini!
commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Jul 28 14:00:15 2013 +0100
Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master
Conflicts:
main.lua
commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:55:50 2013 +0100
Default WorldLimiter = Off
commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:47:24 2013 +0100
Fixed Potential WorldLimit & OnDisable Bugs
Changed WorldLimiter if detection from nil value to config boolean.
Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
a nil value. ??
commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date: Sat Jul 27 11:44:18 2013 -0700
Merge pull request #3 from tonibm19/master
Added /me command
commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:35:22 2013 +0200
Added /me command
commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:30:31 2013 +0200
Added /me command
commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:29:24 2013 +0200
added /me command
commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 09:01:45 2013 -0700
Merge pull request #2 from tigerw/master
Fixed /give descriptor & removed webadmin
commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 17:00:38 2013 +0100
Fixed /give descriptor & removed webadmin
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 08:51:45 2013 -0700
Merge pull request #1 from tigerw/master
Added TPA (tonibm9's fork)
commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 16:38:10 2013 +0100
Added TPA (tonibm9's fork)
With code from STR_Warrior.
commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 15:51:18 2013 +0100
Integrated SpawnProtect & Bugfixes [SEE DESC.]
Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
File and filename cleanup.
commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 23:14:40 2013 +0100
Update README.md
Added info.
commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 19:37:59 2013 +0100
Implemented Block Property checking for Collisions
Used g_BlockIsSolid, instead of checking data values.
commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 15:49:55 2013 +0100
Updated Files
Buildpermandcollision: updated collision code to check for torches and
redstone torches.
Help: attempt at always showing page number
Web_serversettings: attempt at introducing a check for Maximum Players
(must be above zero).
commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:46:08 2013 +0100
Update README.md
Extended 'GUI Redesign' section.
commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:43:00 2013 +0100
Update README.md
Added features and fixes and instructions for use.
commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:35:27 2013 +0100
Uploaded All Files
All Core files, both modified and unmodified.
commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 04:59:50 2013 -0700
Initial commit
|
||
|
Alexander Harkness
|
d6a0f38f71 |
Bring in a fix for Core
Squashed commit of the following:
commit 4e0b3f905e2f937951eebd322b204f8da3e745cd
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 16:38:53 2013 +0100
Fixed bugs in the console command file that were stopping it from working.
There was an extra `end` and an extra `)`
commit ea1215da739e65585b448103e0bf1bebec00dfac
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:06:30 2013 +0100
Fixed duplicate leave messages
commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132
Merge: b273df1 1a6f70f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 06:05:32 2013 -0700
Merge pull request #13 from mc-server/give-console
Added a console command for giving players items.
commit b273df17c759eba82342466cf6e2291d84b77ab3
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 08:27:14 2013 +0100
Hopefully fixed the /i command not working.
I had not defined the newSplit variable before using it.
commit 8a74037cc092d048364299f18e07c02c85ae3737
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:18:48 2013 +0100
Fixed the contributors not being on their own lines.
commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:26:12 2013 +0100
Fix the README - fixes #15
commit cc438b3229cdb730d308479c59491b5e66130118
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:01:48 2013 +0100
Alpha-sort the console commands.
commit aa22f647c27d50b3ccf7e763927bd24329da3a56
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:00:44 2013 +0100
Alpha-sort the commands when they are bound.
commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab
Merge: a485101 01ccfaa
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:41:38 2013 -0700
Merge pull request #14 from mc-server/ireplace
Told the player receiving items what they are getting, and fixed the console log.
commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:39:36 2013 +0100
Told the player reveiving items what they are getting, and fixed the console log.
commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:35:48 2013 +0100
Added a console command for giving players items.
commit a4851010b2ff29bb55feb6331ea6ddec28532a0f
Merge: 0ffbd4a ba923e4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:01:47 2013 -0700
Merge pull request #12 from mc-server/ireplace
Re-implement the /i command and make /give conform to the vanilla standards
commit ba923e4764b6a3064be6aacea86e059828b2d0e6
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:59:53 2013 +0100
Added /item and made /i an alias of it.
commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:46:14 2013 +0100
Kept the stuff alpha-sorted.
commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:45:09 2013 +0100
Removed some extra semicolons.
commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:44:06 2013 +0100
Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good.
commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add
Author: tonibm19 <tonibm19@gmail.com>
Date: Wed Aug 7 13:52:02 2013 +0200
Fixed typo
commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Tue Aug 6 18:23:51 2013 +0100
Re-implement the /i command and make /give conform to the vanilla standards.
This commit is experimental and may fail. Please test it!
commit f4ac029a0f1903fc9e49365117a81293303c8811
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Aug 2 23:23:15 2013 +0100
Miscellaneous Changes
Reduced ban/unban code size a little.
Clarified console commands.
Added commented code to onjoin when bugs are fixed.
Removed embarrassing server wide messages.
commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date: Thu Aug 1 10:58:05 2013 -0700
Merge pull request #10 from mc-server/tabmix
Fix the inconsistency of spaces and tabs.
commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 1 16:47:15 2013 +0100
Changed everything to use the correct system of tabs.
commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed Jul 31 16:56:41 2013 +0100
Rewrote Info Messages + Implemented #7 [SEE DESC]
Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
[FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
Individual worlds have individual LimitWorld setting, with individual
WebAdmin setting as well.
commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 14:47:45 2013 +0100
Fix of nil value in SpawnProtect
commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:19:11 2013 +0100
Fixed potential SpawnProtect nil value issue
Now detects if PROTECTRADIUS is zero, and if so, cancels checks.
commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:07:50 2013 +0100
Enhanced SpawnProtect greatly (thanks xoft)
Wow. Who knew ~30 lines of code could become one?
commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 11:11:22 2013 +0100
Removed Development LOGINFOs
commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 10:40:57 2013 +0100
Implemented Issue #5 Enhancement [SEE DESC]
Made spawn protection configurable in each world's world file. World has
to be listed in settings.ini!
commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Jul 28 14:00:15 2013 +0100
Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master
Conflicts:
main.lua
commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:55:50 2013 +0100
Default WorldLimiter = Off
commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:47:24 2013 +0100
Fixed Potential WorldLimit & OnDisable Bugs
Changed WorldLimiter if detection from nil value to config boolean.
Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
a nil value. ??
commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date: Sat Jul 27 11:44:18 2013 -0700
Merge pull request #3 from tonibm19/master
Added /me command
commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:35:22 2013 +0200
Added /me command
commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:30:31 2013 +0200
Added /me command
commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:29:24 2013 +0200
added /me command
commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 09:01:45 2013 -0700
Merge pull request #2 from tigerw/master
Fixed /give descriptor & removed webadmin
commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 17:00:38 2013 +0100
Fixed /give descriptor & removed webadmin
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 08:51:45 2013 -0700
Merge pull request #1 from tigerw/master
Added TPA (tonibm9's fork)
commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 16:38:10 2013 +0100
Added TPA (tonibm9's fork)
With code from STR_Warrior.
commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 15:51:18 2013 +0100
Integrated SpawnProtect & Bugfixes [SEE DESC.]
Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
File and filename cleanup.
commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 23:14:40 2013 +0100
Update README.md
Added info.
commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 19:37:59 2013 +0100
Implemented Block Property checking for Collisions
Used g_BlockIsSolid, instead of checking data values.
commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 15:49:55 2013 +0100
Updated Files
Buildpermandcollision: updated collision code to check for torches and
redstone torches.
Help: attempt at always showing page number
Web_serversettings: attempt at introducing a check for Maximum Players
(must be above zero).
commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:46:08 2013 +0100
Update README.md
Extended 'GUI Redesign' section.
commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:43:00 2013 +0100
Update README.md
Added features and fixes and instructions for use.
commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:35:27 2013 +0100
Uploaded All Files
All Core files, both modified and unmodified.
commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 04:59:50 2013 -0700
Initial commit
|
||
|
Alexander Harkness
|
44cbb1c011 |
Merge in the latest version of Core.
Squashed commit of the following:
commit ea1215da739e65585b448103e0bf1bebec00dfac
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Aug 10 16:06:30 2013 +0100
Fixed duplicate leave messages
commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132
Merge: b273df1 1a6f70f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 06:05:32 2013 -0700
Merge pull request #13 from mc-server/give-console
Added a console command for giving players items.
commit b273df17c759eba82342466cf6e2291d84b77ab3
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 08:27:14 2013 +0100
Hopefully fixed the /i command not working.
I had not defined the newSplit variable before using it.
commit 8a74037cc092d048364299f18e07c02c85ae3737
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:18:48 2013 +0100
Fixed the contributors not being on their own lines.
commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:26:12 2013 +0100
Fix the README - fixes #15
commit cc438b3229cdb730d308479c59491b5e66130118
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:01:48 2013 +0100
Alpha-sort the console commands.
commit aa22f647c27d50b3ccf7e763927bd24329da3a56
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:00:44 2013 +0100
Alpha-sort the commands when they are bound.
commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab
Merge: a485101 01ccfaa
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:41:38 2013 -0700
Merge pull request #14 from mc-server/ireplace
Told the player receiving items what they are getting, and fixed the console log.
commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:39:36 2013 +0100
Told the player reveiving items what they are getting, and fixed the console log.
commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:35:48 2013 +0100
Added a console command for giving players items.
commit a4851010b2ff29bb55feb6331ea6ddec28532a0f
Merge: 0ffbd4a ba923e4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:01:47 2013 -0700
Merge pull request #12 from mc-server/ireplace
Re-implement the /i command and make /give conform to the vanilla standards
commit ba923e4764b6a3064be6aacea86e059828b2d0e6
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:59:53 2013 +0100
Added /item and made /i an alias of it.
commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:46:14 2013 +0100
Kept the stuff alpha-sorted.
commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:45:09 2013 +0100
Removed some extra semicolons.
commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:44:06 2013 +0100
Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good.
commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add
Author: tonibm19 <tonibm19@gmail.com>
Date: Wed Aug 7 13:52:02 2013 +0200
Fixed typo
commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Tue Aug 6 18:23:51 2013 +0100
Re-implement the /i command and make /give conform to the vanilla standards.
This commit is experimental and may fail. Please test it!
commit f4ac029a0f1903fc9e49365117a81293303c8811
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Aug 2 23:23:15 2013 +0100
Miscellaneous Changes
Reduced ban/unban code size a little.
Clarified console commands.
Added commented code to onjoin when bugs are fixed.
Removed embarrassing server wide messages.
commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date: Thu Aug 1 10:58:05 2013 -0700
Merge pull request #10 from mc-server/tabmix
Fix the inconsistency of spaces and tabs.
commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 1 16:47:15 2013 +0100
Changed everything to use the correct system of tabs.
commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed Jul 31 16:56:41 2013 +0100
Rewrote Info Messages + Implemented #7 [SEE DESC]
Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
[FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
Individual worlds have individual LimitWorld setting, with individual
WebAdmin setting as well.
commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 14:47:45 2013 +0100
Fix of nil value in SpawnProtect
commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:19:11 2013 +0100
Fixed potential SpawnProtect nil value issue
Now detects if PROTECTRADIUS is zero, and if so, cancels checks.
commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:07:50 2013 +0100
Enhanced SpawnProtect greatly (thanks xoft)
Wow. Who knew ~30 lines of code could become one?
commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 11:11:22 2013 +0100
Removed Development LOGINFOs
commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 10:40:57 2013 +0100
Implemented Issue #5 Enhancement [SEE DESC]
Made spawn protection configurable in each world's world file. World has
to be listed in settings.ini!
commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Jul 28 14:00:15 2013 +0100
Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master
Conflicts:
main.lua
commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:55:50 2013 +0100
Default WorldLimiter = Off
commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:47:24 2013 +0100
Fixed Potential WorldLimit & OnDisable Bugs
Changed WorldLimiter if detection from nil value to config boolean.
Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
a nil value. ??
commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date: Sat Jul 27 11:44:18 2013 -0700
Merge pull request #3 from tonibm19/master
Added /me command
commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:35:22 2013 +0200
Added /me command
commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:30:31 2013 +0200
Added /me command
commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:29:24 2013 +0200
added /me command
commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 09:01:45 2013 -0700
Merge pull request #2 from tigerw/master
Fixed /give descriptor & removed webadmin
commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 17:00:38 2013 +0100
Fixed /give descriptor & removed webadmin
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 08:51:45 2013 -0700
Merge pull request #1 from tigerw/master
Added TPA (tonibm9's fork)
commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 16:38:10 2013 +0100
Added TPA (tonibm9's fork)
With code from STR_Warrior.
commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 15:51:18 2013 +0100
Integrated SpawnProtect & Bugfixes [SEE DESC.]
Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
File and filename cleanup.
commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 23:14:40 2013 +0100
Update README.md
Added info.
commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 19:37:59 2013 +0100
Implemented Block Property checking for Collisions
Used g_BlockIsSolid, instead of checking data values.
commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 15:49:55 2013 +0100
Updated Files
Buildpermandcollision: updated collision code to check for torches and
redstone torches.
Help: attempt at always showing page number
Web_serversettings: attempt at introducing a check for Maximum Players
(must be above zero).
commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:46:08 2013 +0100
Update README.md
Extended 'GUI Redesign' section.
commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:43:00 2013 +0100
Update README.md
Added features and fixes and instructions for use.
commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:35:27 2013 +0100
Uploaded All Files
All Core files, both modified and unmodified.
commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 04:59:50 2013 -0700
Initial commit
|
||
|
Alexander Harkness
|
0355be903f |
Merge all the latest stuff from Core.
Squashed commit of the following:
commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132
Merge: b273df1 1a6f70f
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 06:05:32 2013 -0700
Merge pull request #13 from mc-server/give-console
Added a console command for giving players items.
commit b273df17c759eba82342466cf6e2291d84b77ab3
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sat Aug 10 08:27:14 2013 +0100
Hopefully fixed the /i command not working.
I had not defined the newSplit variable before using it.
commit 8a74037cc092d048364299f18e07c02c85ae3737
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 8 10:18:48 2013 +0100
Fixed the contributors not being on their own lines.
commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:26:12 2013 +0100
Fix the README - fixes #15
commit cc438b3229cdb730d308479c59491b5e66130118
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:01:48 2013 +0100
Alpha-sort the console commands.
commit aa22f647c27d50b3ccf7e763927bd24329da3a56
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 18:00:44 2013 +0100
Alpha-sort the commands when they are bound.
commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab
Merge: a485101 01ccfaa
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:41:38 2013 -0700
Merge pull request #14 from mc-server/ireplace
Told the player receiving items what they are getting, and fixed the console log.
commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:39:36 2013 +0100
Told the player reveiving items what they are getting, and fixed the console log.
commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 17:35:48 2013 +0100
Added a console command for giving players items.
commit a4851010b2ff29bb55feb6331ea6ddec28532a0f
Merge: 0ffbd4a ba923e4
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 09:01:47 2013 -0700
Merge pull request #12 from mc-server/ireplace
Re-implement the /i command and make /give conform to the vanilla standards
commit ba923e4764b6a3064be6aacea86e059828b2d0e6
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:59:53 2013 +0100
Added /item and made /i an alias of it.
commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:46:14 2013 +0100
Kept the stuff alpha-sorted.
commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:45:09 2013 +0100
Removed some extra semicolons.
commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7
Author: Alexander Harkness <bearbin@gmail.com>
Date: Wed Aug 7 16:44:06 2013 +0100
Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good.
commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add
Author: tonibm19 <tonibm19@gmail.com>
Date: Wed Aug 7 13:52:02 2013 +0200
Fixed typo
commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a
Author: Alexander Harkness <bearbin@gmail.com>
Date: Tue Aug 6 18:23:51 2013 +0100
Re-implement the /i command and make /give conform to the vanilla standards.
This commit is experimental and may fail. Please test it!
commit f4ac029a0f1903fc9e49365117a81293303c8811
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Aug 2 23:23:15 2013 +0100
Miscellaneous Changes
Reduced ban/unban code size a little.
Clarified console commands.
Added commented code to onjoin when bugs are fixed.
Removed embarrassing server wide messages.
commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date: Thu Aug 1 10:58:05 2013 -0700
Merge pull request #10 from mc-server/tabmix
Fix the inconsistency of spaces and tabs.
commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date: Thu Aug 1 16:47:15 2013 +0100
Changed everything to use the correct system of tabs.
commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed Jul 31 16:56:41 2013 +0100
Rewrote Info Messages + Implemented #7 [SEE DESC]
Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
[FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
Individual worlds have individual LimitWorld setting, with individual
WebAdmin setting as well.
commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 14:47:45 2013 +0100
Fix of nil value in SpawnProtect
commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:19:11 2013 +0100
Fixed potential SpawnProtect nil value issue
Now detects if PROTECTRADIUS is zero, and if so, cancels checks.
commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 13:07:50 2013 +0100
Enhanced SpawnProtect greatly (thanks xoft)
Wow. Who knew ~30 lines of code could become one?
commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 11:11:22 2013 +0100
Removed Development LOGINFOs
commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon Jul 29 10:40:57 2013 +0100
Implemented Issue #5 Enhancement [SEE DESC]
Made spawn protection configurable in each world's world file. World has
to be listed in settings.ini!
commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date: Sun Jul 28 14:00:15 2013 +0100
Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master
Conflicts:
main.lua
commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:55:50 2013 +0100
Default WorldLimiter = Off
commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun Jul 28 12:47:24 2013 +0100
Fixed Potential WorldLimit & OnDisable Bugs
Changed WorldLimiter if detection from nil value to config boolean.
Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
a nil value. ??
commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date: Sat Jul 27 11:44:18 2013 -0700
Merge pull request #3 from tonibm19/master
Added /me command
commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:35:22 2013 +0200
Added /me command
commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:30:31 2013 +0200
Added /me command
commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date: Sat Jul 27 20:29:24 2013 +0200
added /me command
commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 09:01:45 2013 -0700
Merge pull request #2 from tigerw/master
Fixed /give descriptor & removed webadmin
commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 17:00:38 2013 +0100
Fixed /give descriptor & removed webadmin
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 08:51:45 2013 -0700
Merge pull request #1 from tigerw/master
Added TPA (tonibm9's fork)
commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 16:38:10 2013 +0100
Added TPA (tonibm9's fork)
With code from STR_Warrior.
commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat Jul 27 15:51:18 2013 +0100
Integrated SpawnProtect & Bugfixes [SEE DESC.]
Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
File and filename cleanup.
commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 23:14:40 2013 +0100
Update README.md
Added info.
commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 19:37:59 2013 +0100
Implemented Block Property checking for Collisions
Used g_BlockIsSolid, instead of checking data values.
commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri Jul 26 15:49:55 2013 +0100
Updated Files
Buildpermandcollision: updated collision code to check for torches and
redstone torches.
Help: attempt at always showing page number
Web_serversettings: attempt at introducing a check for Maximum Players
(must be above zero).
commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:46:08 2013 +0100
Update README.md
Extended 'GUI Redesign' section.
commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:43:00 2013 +0100
Update README.md
Added features and fixes and instructions for use.
commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 19:35:27 2013 +0100
Uploaded All Files
All Core files, both modified and unmodified.
commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu Jul 25 04:59:50 2013 -0700
Initial commit
|
||
|
Alexander Harkness
|
e508e09753 |
Merge pull request #56 from mc-server/LinuxColorConsole
Linux color console |
||
|
madmaxoft
|
15f80e0811 |
Linux color redirection fixed.
Outputting to stdin, yeah, right, that's gonna work :P |
||
|
madmaxoft
|
19781ecad5 | Coloring is reset before the LF. | ||
|
madmaxoft
|
9794496571 | Another Linux compilation fix. | ||
|
madmaxoft
|
211a8395d4 | Fixed Linux build. | ||
|
madmaxoft
|
63b2fa21e8 | Disabled coloring for redirected output. | ||
|
madmaxoft
|
528feaba2c |
Use printf() instead of puts().
puts() outputs an extra newline, making it unsuitable |
||
|
madmaxoft
|
2a97bed3b4 | Bad preprocesor used for discovering Linux | ||
|
madmaxoft
|
d3c29c5a88 |
Piston head, when removed, removes the associated piston body, too.
Fixes FS 388 |
||
|
madmaxoft
|
72e2891017 | Fixed squid crashing the server when above or below the world | ||
|
madmaxoft
|
c85acd4ece | Renamed Plugin_NewLua to PluginLua. | ||
|
madmaxoft
|
8fd67cf12a |
First attempt at Linux console colors
Ref.: issue #41 |
||
|
Alexander Harkness
|
33155a51e2 |
Merge pull request #55 from mc-server/falldamage-teleport
Keep players from taking damage when teleporting. (Hopefully). |
||
|
Alexander Harkness
|
e9b9f1861c | Fixed stupid syntax error (thanks build system). | ||
|
Alexander Harkness
|
eaec6a4aab |
Keep players from taking damage when teleporting. (Hopefully).
Fixes #29 |
||
|
madmaxoft
|
f89d6cc9af |
Piston head, when removed, removes the associated piston body, too.
Fixes FS 388 |
||
|
madmaxoft
|
7c9c51425b | Fixed squid crashing the server when above or below the world | ||
|
madmaxoft
|
7d70a06461 | Renamed Plugin_NewLua to PluginLua. | ||
|
madmaxoft
|
d4a3c451c4 |
Added OnExploding() and OnExploded() hooks.
As requested in FS 413, with extra parameters: World, BlockX, BlockY, BlockZ, Size, CanCauseFire, Source, SourceData OnExploding() can return 3 values: StopHook, CanCauseFire, ExplosionSize |
||
|
Alexander Harkness
|
6f2c099f70 |
Merge pull request #52 from ravenscroftj/feature/food
A few fixes for the hunger/food system + tests for swimming and submerged in cPlayer. |
||
James Ravenscroft
|
6963e8119c | Fixed some formatting issues I accidentally introduced | ||
|
James Ravenscroft
|
ffce5d143f | Removed the need to recalculate whether player is under water in ApplyFoodExhaustion | ||
|
James Ravenscroft
|
dace1f7bd2 | Added IsSwimming and IsSubmerged flags and access methods | ||
|
James Ravenscroft
|
2b9fdc3e36 | Fixed the jump food exhaustion being added when player is swimming | ||
|
James Ravenscroft
|
9f7db50de0 | Fixed food handler for mushroom soup - proper food level and saturation are applied and the player receives a wooden bowl back after nomming | ||
|
madmaxoft
|
23b15a926c |
Fixed a copypasta error in hook function names.
Thanks STR_Warrior for the report |
||
|
madmaxoft
|
eb323166d9 |
Removed LuaScript.
The WebAdmin now uses LuaState directly to call the one function it needs. |
||
|
madmaxoft
|
cc920ea929 | cPlugin_NewLua is now completely rewritten to use templated LuaState calls. |