Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | 2.9 -> 3.0 (new commands and signs) | Iaccidentally | 2012-08-06 | -20/+173 | |
| | |||||
* | Merge pull request #110 from Yofel/master | Iaccidentally | 2012-08-06 | -2/+2 | |
|\ | | | | | use the correct enum types in the switch | ||||
| * | fix the last commit to use the enum values correctly | Philip Muskovac | 2012-08-04 | -2/+2 | |
| | | |||||
* | | Merge pull request #109 from Yofel/master | Alexander Schepp | 2012-08-04 | -1/+12 | |
|\| | | | | | make /gc show END worlds as The End | ||||
| * | add support for the end to /gc | Philip Muskovac | 2012-08-04 | -1/+12 | |
| | | |||||
* | | master branch too! | Iaccidentally | 2012-08-04 | -8/+8 | |
| | | |||||
* | | I before E, except after C. | Iaccidentally | 2012-08-04 | -1/+1 | |
| | | |||||
* | | I am a master grammar nazi | Iaccidentally | 2012-08-04 | -1/+1 | |
|/ | |||||
* | Merge pull request #105 from oggehej/patch-1 | Alexander Schepp | 2012-08-01 | -1/+1 | |
|\ | | | | | "gameMode" message [Swedish Translation] | ||||
| * | "gameMode" message, if you're choosing creative is it grammatically incorrect. | oggehej | 2012-07-19 | -1/+1 | |
| | | | | | | | | Ex: Satte kreativs spelläge till oggehej. It should then be "kreativt", but you can't choose to have both "{0}s" and "{0}t". | ||||
* | | Merge pull request #107 from necrodoom/patch-1 | Alexander Schepp | 2012-08-01 | -521/+1922 | |
|\ \ | | | | | | | update items.csv to 1.3, may need extra cleanup | ||||
| * | | removed useless emerald aliases | necrodoom | 2012-08-01 | -12/+0 | |
| | | | | | | | | | items.csv version 2.1_05 | ||||
| * | | added splash mundane and unreverted dualbit | necrodoom | 2012-08-01 | -0/+70 | |
| | | | | | | | | | version 2.1_04 of items.csv | ||||
| * | | update items.csv to 1.3, may need extra cleanup | necrodoom | 2012-07-31 | -521/+1864 | |
| | | | | | | | | | if someone is updating from 1.2 to 1.3 he must use new items.csv, due to changes in woodenslab crafting. | ||||
* | | | Merge pull request #106 from samschaap/patch-1 | Alexander Schepp | 2012-08-01 | -1/+1 | |
|\ \ \ | |/ / |/| | | Fixed small typo | ||||
| * | | Fixed small typo | samschaap | 2012-07-20 | -1/+1 | |
| | | | |||||
* | | | Allow to cancel the event | snowleo | 2012-07-29 | -1/+2 | |
| | | | |||||
* | | | Events WIP | snowleo | 2012-07-29 | -49/+466 | |
| | | | |||||
* | | | Fix days in polish translation | Alexander Schepp | 2012-07-26 | -1/+1 | |
| | | | |||||
* | | | fixed args count | Iaccidentally | 2012-07-22 | -1/+1 | |
| | | | |||||
* | | | Round 1 of fixing getPlayer in commands | Iaccidentally | 2012-07-22 | -36/+38 | |
| | | | |||||
* | | | Fix AbstractDelayedYamlFileReader | snowleo | 2012-07-22 | -1/+1 | |
| | | | |||||
* | | | Fix StoredLocation | snowleo | 2012-07-22 | -19/+3 | |
| | | | |||||
* | | | Compile on save all enabled in Netbeans | snowleo | 2012-07-22 | -0/+18 | |
| | | | |||||
* | | | Removing /nuke and /antioch | snowleo | 2012-07-22 | -157/+3 | |
| | | | |||||
* | | | Fix interface params to match with the implementation method | snowleo | 2012-07-22 | -25/+25 | |
| | | | |||||
* | | | Update of Lombok to 0.11.2 | snowleo | 2012-07-22 | -1/+1 | |
| | | | |||||
* | | | Fix more stuff in 3.0 | snowleo | 2012-07-22 | -173/+483 | |
|/ / | |||||
* | | Be careful with getUser vs matchUser | ementalo | 2012-07-20 | -1/+1 | |
| | | |||||
* | | Clear up merge leftovers | ementalo | 2012-07-20 | -4/+1 | |
| | | |||||
* | | mail player matching update | ementalo | 2012-07-20 | -9/+9 | |
| | | |||||
* | | Some user matching updates | ementalo | 2012-07-20 | -201/+172 | |
|/ | |||||
* | Revert "more replacing. fix getUser();" | ementalo | 2012-07-17 | -61/+58 | |
| | | | | This reverts commit ab9545624c351f3518e6d1863ff24020b6bed605. | ||||
* | more replacing. fix getUser(); | Iaccidentally | 2012-07-17 | -58/+61 | |
| | |||||
* | fix permission.default in afk | Iaccidentally | 2012-07-17 | -4/+3 | |
| | |||||
* | round 2 of import fixing | Iaccidentally | 2012-07-17 | -25/+29 | |
| | |||||
* | Use IServer not bukkit server | Iaccidentally | 2012-07-17 | -2/+3 | |
| | |||||
* | Fixing imports and removing bukkit in commands | Iaccidentally | 2012-07-17 | -72/+149 | |
| | |||||
* | Some more fixes | ementalo | 2012-07-17 | -11/+64 | |
| | |||||
* | Command perms fix | ementalo | 2012-07-17 | -30/+24 | |
| | |||||
* | Merge of server-layer branch | ementalo | 2012-07-17 | -14853/+13580 | |
|\ | |||||
| * | Update master | Alexander Schepp | 2012-07-15 | -1/+1 | |
| | | |||||
| * | Merge pull request #102 from gravypod/master | Alexander Schepp | 2012-07-15 | -1/+39 | |
| |\ | | | | | | | NecroDoom's CVS fix | ||||
| | * | Made by Necrodoom. [He just asked me to push this] | gravypod | 2012-07-15 | -1/+39 | |
| | | | |||||
| * | | Merge pull request #98 from xGhOsTkiLLeRx/master | Alexander Schepp | 2012-07-15 | -77/+77 | |
| |\ \ | | | | | | | | | Updated German language file | ||||
| | * | | Done | xGhOsTkiLLeRx | 2012-07-15 | -1/+1 | |
| | | | | |||||
| | * | | Rev 3 - final? | xGhOsTkiLLeRx | 2012-07-13 | -12/+12 | |
| | | | | |||||
| | * | | Fixed "muted" messages - wasn't my fault ;) | xGhOsTkiLLeRx | 2012-07-12 | -2/+2 | |
| | | | | |||||
| | * | | Last line translated | xGhOsTkiLLeRx | 2012-07-12 | -1/+1 | |
| | | | | |||||
| | * | | Update master | xGhOsTkiLLeRx | 2012-07-12 | -1/+1 | |
| | | | |