Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-27 17:28:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,883 Commits 14 Branches 69 Tags 90 MiB
ef4438889b
Commit Graph

1883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swan201
b71b0aa46e Update Korean Translation 2015-11-30 05:59:14 +09:00
swan201
dcefa95278 Merge pull request #1 from IntellectualSites/master 
Merge
 2015-11-30 05:56:40 +09:00
Alexander Söderberg
60406812ee Merge pull request #764 from manuelgu/patch-3 
remove website link
 2015-11-29 21:42:20 +01:00
Jesse Boyd
82ccca8f63 . 2015-11-30 02:24:01 +11:00
manuelgu
1fcb4ea705 remove website link 2015-11-29 12:49:20 +01:00
Jesse Boyd
9118f111e4 Fixes 
fixes #763
 2015-11-29 19:21:32 +11:00
Jesse Boyd
c2b781da98 Deny negative ratings 2015-11-28 23:27:36 +11:00
Jesse Boyd
1ee13ff96c Fix commands being case sensitive. 2015-11-28 22:56:12 +11:00
Jesse Boyd
d1ac355e58 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 
# Conflicts:
#	src/main/java/com/intellectualcrafters/plot/config/C.java
 2015-11-28 22:49:42 +11:00
Jesse Boyd
94b0fbb266 Stuff 
Fixes #748
Fixes #759
 2015-11-28 22:46:10 +11:00
Jesse Boyd
ef327434cd Merge pull request #751 from Aaron1011/update-spongeapi 
git@github.com:Aaron1011/PlotSquared.gitUpdate for SpongeAPI changes
 2015-11-26 14:45:39 +11:00
Aaron Hill
e0e2756b95 Update for SpongeAPI changes 2015-11-25 22:40:22 -05:00
Alexander Söderberg
7d494fef16 Merge pull request #749 from manuelgu/patch-1 
fixed importing
 2015-11-25 23:12:00 +01:00
manuelgu
7bbf549221 fixed importing 
related to #733
 2015-11-25 23:05:08 +01:00
Alexander Söderberg
a0c93bb3e7 Merge pull request #747 from manuelgu/patch-2 
formatting in german file
 2015-11-25 22:51:18 +01:00
Alexander Söderberg
46989faee6 Merge pull request #746 from manuelgu/patch-1 
formatting
 2015-11-25 22:51:06 +01:00
manuelgu
f80a833689 formatting in german file 2015-11-25 22:30:35 +01:00
manuelgu
eba75363c8 formatting 2015-11-25 22:29:20 +01:00
Alexander Söderberg
cc10c52230 Update README.md 2015-11-25 22:04:16 +01:00
Alexander Söderberg
8a1dfe46c9 Merge pull request #733 from manuelgu/patch-1 
fix color formatting
 2015-11-22 22:01:28 +01:00
manuelgu
d56b4da7c2 fix color formatting 2015-11-22 12:04:24 +01:00
Jesse Boyd
7db30590c6 Fixes 
Fixes #701
Fixes set components for other plots
Add setowner uuid.
Probably some other stuff
 2015-11-20 17:28:33 +11:00
Jesse Boyd
7ed693dfc8 Fix populator random seed / algorithm differing from chunk generator 2015-11-18 16:42:19 +11:00
Jesse Boyd
1e1259b81d Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2015-11-18 10:39:52 +11:00
Jesse Boyd
452efc4b08 Fix 
Fixes #724
Fixes flag remove for non list based flags when player lacks permission.
 2015-11-18 10:39:44 +11:00
Jesse Boyd
9adb256ff6 Merge pull request #719 from manuelgu/patch-2 
remove not needed message
 2015-11-16 12:31:36 +11:00
manuelgu
c34f41b150 remove not needed message 
Since calculating the TPS Values has been removed, the message is no longer in use
 2015-11-15 18:58:12 +01:00
Jesse Boyd
a8140f8cb0 Check if no metadata is set. 2015-11-15 20:52:32 +11:00
Jesse Boyd
27d1ba810b Default, default flags 2015-11-15 19:56:32 +11:00
Jesse Boyd
9218147aa0 Whoops. 2015-11-15 13:51:28 +11:00
Jesse Boyd
ab5e826fe8 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2015-11-15 13:31:01 +11:00
Jesse Boyd
93a7b2cace Potential fixes 
Fixes #712
Fixes #711
Fixes #707
Fixes #705
Fixes #702
Fixes #698
Fixes #697
Fixes #694
Fixes #717
 2015-11-15 13:30:52 +11:00
Jesse Boyd
8a9f4d2598 Merge pull request #706 from swan201/master 
Add Korean Translate File
 2015-11-07 12:48:40 +11:00
swan201
ebf0fee3ac Add Korean Translate File 
First Korean Translate
 2015-11-07 10:44:31 +09:00
Jesse Boyd
c32edfe0ee . 2015-11-04 04:52:44 +11:00
Jesse Boyd
008e35d307 Fixes #700 2015-11-04 02:39:42 +11:00
Jesse Boyd
215ed04754 Minor tweaks 2015-10-29 23:13:10 +11:00
Jesse Boyd
95feaed870 Changes 
ratings api
misc-cap
other tweakes
 2015-10-27 10:57:34 +11:00
Jesse Boyd
2e79f3d0f8 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2015-10-26 18:21:35 +11:00
Jesse Boyd
2afc16de7a Schematics / tweak message 2015-10-26 18:18:31 +11:00
Jesse Boyd
bc836201d5 Merge pull request #687 from manuelgu/patch-1 
Update german.yml
 2015-10-26 18:05:49 +11:00
manuelgu
24406a250b Update german.yml 
tweaked some german translations and also added untranslated things
 2015-10-24 22:52:50 +02:00
Jesse Boyd
e20e4a8650 Fixes 
Closes #683
Potential fix for sign issue
Potential fix for templates not working
Incremented version number.
 2015-10-24 21:55:34 +11:00
Jesse Boyd
6650ea2a4c Fixes #681 2015-10-21 18:31:14 +11:00
Jesse Boyd
a6dad4fb7b Fixes #682 2015-10-21 16:34:15 +11:00
Jesse Boyd
fa442f5903 Fixes 
closes #679
closes #676
 2015-10-19 17:27:51 +11:00
Jesse Boyd
f509252646 Fix plot cluster command from console. 2015-10-18 23:31:35 +11:00
Jesse Boyd
f75822f56c Fixed no argument feedback for move/copy/swap 2015-10-18 23:18:45 +11:00
Jesse Boyd
26c0e3fa85 Fixes 
- Fix sign lines on claim not updating
- Fix plot tier removing for merged plots
- Fix stair rotation for id=24
- Fix interaction to have a lower priority than chestshop (why doesn't
chestshop use monitor priority?)
 2015-10-18 22:20:12 +11:00
Jesse Boyd
c595b69c3a fixed world loading. 2015-10-18 01:25:17 +11:00