github.com/IntellectualSites/PlotSquared commits

resolve rebase issue

457f3e25cc970764558a7d4b57f5f450f299fdfb authored over 4 years ago

Fix recursive call

505bba7612a1035e9fb79e3c9f61a767f27c52dc authored over 4 years ago

Insert missing keys into message files

9b086b3f2aa097d8d932eafe9a071868375643f3 authored over 4 years ago

Change player locale on event

72507aba4b689a4a951beb46a256cbcb4ae281af authored over 4 years ago

Fix clickable messages

f9d7d2d1dd1904ec47c8ebe94609e50cd8665bcb authored over 4 years ago

Fix some translation issues

e9efa3f2d30cb64b675c61509f0e5ff9c8c1f433 authored over 4 years ago

Fill out a lot more JavaDoc.

I've left DB stuff alone

665a72a08f405580855800f16a3fdd30016cb103 authored over 4 years ago

Ignore Events if they are not caused by real players (i.e. citizens)

61d1dcc231b5e1657a7b0fdae5089e21bcaa317c authored over 4 years ago

Apply patch by @SirYwell to construct the ResourceKey without consulting the DimensionManager

6c9b73b100a5ae2cf175b19d6424e0cedbba8604 authored over 4 years ago

Fix startup issues and make messages send properly

a4c9ed90b704c11fc8290a0ffe0a475fce43e14d authored over 4 years ago

Fix shading mess and make the plugin start

28d6d4db92dc5a9dada12e6d9bf6f5360074f010 authored over 4 years ago

clean up some javadoc stuff

12def37194c983cf38dd132bd26bb469245da152 authored over 4 years ago

Remove illegal import

ed2302e54547524fbd23c00737fb86fc4491cf10 authored over 4 years ago

Update license and remove dead module entries

618adb913dde537b74d5bfda03cf5007ff2c1e3e authored over 4 years ago

Update license header

4a220f9bfb54d91aaedd5f4db453a845d766d56b authored over 4 years ago

Merge pull request #2888 from IntellectualSites/fix-conversion

Fix problem with config creation

300abd868a96150ed665aa3d7d4ba77f4cded040 authored over 4 years ago

Add service system and rewrite Auto to use the service system

87f0b1fc974a405e36f40a861db11789db990ee3 authored over 4 years ago

5.13.2

78a6e72fe17efc1aae0878565ce29c8b8b96a267 authored over 4 years ago

fix pve against animals on other plots and roads

8f1b2a9d2a82194c1e4077d25b6572656d424fc4 authored over 4 years ago

Fix color tag

5b27b652e74c686d96be5fdf495968b01389614f authored over 4 years ago

Fix line break

556ff0baf439bee7ba1517c07400a7cc021749cd authored over 4 years ago

Fix spelling

8cc536b20f490390cad0d5b4e21f801242c293eb authored over 4 years ago

Fix metrics setting

5e20c871a56162dc311faa0b3c993cb01e5a31ae authored over 4 years ago

Fix brackets

56fb8928184e96a04c50f536f2c752373a47e333 authored over 4 years ago

Permission cleanup

- Removed plotme perms
- Fixed incorrect permission for "/plot flag remove"
- Fixed incorrect ad...

7f104c249af21b0716b2b0edf691342864a7f15d authored over 4 years ago

Remove old translations

0eeface3748e2f8c69208f44cf462d8b683cb376 authored over 4 years ago

Core is Core

ffe1e1e40d05af51ef03230a604690501eac3922 authored over 4 years ago

Remove dead asset setting

5efdef19cfc4449d77a77cd2c071f2a835d9208c authored over 4 years ago

Remove old translation setup and move commands to templates

c9fae6a0705c8491bfb8c09c2ce030d4cc8a3304 authored over 4 years ago

Merge v5 into v6

2b17f730d4cb462f19cd67af4017ae2081fb935c authored over 4 years ago

Apply scaling to image

808bddbfbb1d85473104b4040786dac53e3e8f6b authored over 4 years ago

https

d6dfa9a0b9b5a06e233ca9cb0b762ac7caed0fb4 authored over 4 years ago

Merge pull request #2896 from luca-gg/patch-1

Update de-DE.yml

924b73f070e5827247851fd9c13c2a3834b6d584 authored over 4 years ago

Update de-DE.yml

adjusted grammar

64181c6ab8341dc4e281e592826a1822bc969a37 authored over 4 years ago

Remove dead files

a1b10a2900ec15adead0146f7c98348b73c99aec authored over 4 years ago

gradle 6.6

6315b9ea52c5176354fd2c344d020c9e9ca34318 authored over 4 years ago

1.16.2 support

- Bump EssentialsX version to the latest release

7c756304b55f57f44d05a398eeedec4fbf8abb44 authored over 4 years ago

Merge pull request #2893 from JunTVDE/de-translation-edit

added german translation for flag-descriptions to de-DE.yml

9fd11fbe13ae2d77b85ee3e92eb118b2e1688c7a authored over 4 years ago

Merge pull request #2894 from TimonMi/patch-1

Update link for contributing

7cd9a03b0f32bee7cf5843caa08e8ff6e1cd7232 authored over 4 years ago

Update link for contributing

f8bd844c6cfd7f1b5c31f659974518312691da08 authored over 4 years ago

added german translation for flag-descriptions to de-DE.yml

987d9a267c0add3e954a10193fd9325a8ef4e577 authored over 4 years ago

Merge remote-tracking branch 'upstream/v5' into v5

98d1bb926484ea24c1bbfdf3ba6de13a5041ed52 authored over 4 years ago

Keep player names, so they don't have to be looked up again.

That way the lookup function MainUtil#getName won't get called which would throw an exception if ...

b46a19f5ca7255c6d6f4fef9cabbb4493b158930 authored over 4 years ago

remove PllayerEvents

6e16ef1246d1a30e4c1b87798ee69723979ca0fb authored over 4 years ago

Merge branch 'v6' into feature/v6/json. It builds!

# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform....

7bad242944f05da90324bc766fae9e8dad372377 authored over 4 years ago

Finish up core and bukkit json

74a5c482148a1a0fad36c915617742aa90e3bd0c authored over 4 years ago

Fix a little oopsie

11af906c79a7ccb1ce2ee0ceb941c265e2ac686d authored over 4 years ago

More work

c31c4b428698805c88126a3bfe5495b14c80038d authored over 4 years ago

ComponentPreset inventory to json

7f29b5d1e87fa5a418c6ec7804911b207eb78c47 authored over 4 years ago

Implement Permission#format to replace the CaptionUtility#format method

6012705e95b94b00cc6c93d9a859cae2e4daceda authored over 4 years ago

Refactor Captions to Permission, reimplement message list in debug command

21a97863ac0eecbe3c3de1a18a2aee42a9243781 authored over 4 years ago

Several minor progress. Couple of bigger (inboxes and help)

50cfecb3fdecdaec9171d5a1408fc27ccc4f3f33 authored over 4 years ago

Remove last reference to PlotMessage in Core

1461804039aa487462110d8bfe07bff87f618127 authored over 4 years ago

Added UseFlag check at Roads

dc3f45acd4ab9650c806e937d70a61ee1cf8f68e authored over 4 years ago

More json progress

6970dfa5f8f4344056402a48555ce0ccf63b5cf7 authored over 4 years ago

Fixes an OfflinePlayerUtil breakage caused by NMS Changes

48d3c2105d71219948b55d2fe9f7d227e2b15049 authored over 4 years ago

Bit more json

18f630ba15aec60aece0984a33f11bea230248a2 authored over 4 years ago

update plot list

f68eb9c7789fa5d21ee4b80fd3a4cfd6507cc344 authored over 4 years ago

update pagination to new json

4a960d9f2c71fc2631ef5e8750d8e42a7281a36a authored over 4 years ago

Added UseFlag check at Roads

c745b99922a88e6c93fe6924eff0a5cec9c3113a authored over 4 years ago

Several more progress

f1e3902fea99a09c1626d38b844da6d22861c942 authored over 4 years ago

More work towards json

41a623a643ccbeb897208622db684253db335f4c authored over 4 years ago

Fix plot info, sign usage in Plot.class

d3fe1d3b2bab02a7e1ef66d3c69d0cfa49d65f26 authored over 4 years ago

Making progress on messages

3fd3baaa47040da49c5e766be5fc7861f745407a authored over 4 years ago

Add more information to the debugpaste

01d2b0024fed2b274d1b62fb590dc5d0830ce318 authored over 4 years ago

Readd skyblock template

01e66f8833cce2c09511f8f9b53fcdc4fd5fac0d authored over 4 years ago

Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5

afd9b56e71270fcda1345944be3a36ef3f069277 authored over 4 years ago

Fixes https://issues.intellectualsites.com/issue/PS-81

- Add break statements to switches to prevent bleed from normal spawning to breeding
- Separate...

e2f9b4245b9f7168fc38d9cb10cd05efcb42fe05 authored over 4 years ago

Revert "Update zh-CN.yml"

This reverts commit 240362a16d1ee37228ea95672360417034a19af3.

22a007b514387c3242d19ce801a8934e463583ed authored over 4 years ago

A little spring cleaning

- Add Javadoc comments for where QueueCoordinator can be given or nulled
- Add some more Javado...

38988b48191767e24991b6220ab6129e77f529af authored over 4 years ago

Use placeholder

704e92c3d0cb6283f5ed56fcf99bed4de549d2c5 authored over 4 years ago

Move comments to ChunkCoordinator, remove Range annotations

97b1a60ae8ab6326a47b1e4f1d07b95f0f44ae2d authored over 4 years ago

Better constructor error handling in QueueProvider.

Add back default constructor requiring world to QueueCoordinator to indicate extents require this...

32887212590cbb51897c93fc19c79d45631c1461 authored over 4 years ago

Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/133

ab121c7eee9bd194328b0aea11577136445c26ae authored over 4 years ago

Update zh-CN.yml

240362a16d1ee37228ea95672360417034a19af3 authored over 4 years ago

Fix problem where servers created in v5 (not converted from v4) would fail to start properly.

This is a quite major issue and I hope this fix resolves it. Although, it should be tested with ...

f2dcbce4905309f219a50f04194b57e32aa3fd3e authored over 4 years ago

Create CODE_OF_CONDUCT.md

88df434404ce060633ec393db9e493044f582b79 authored over 4 years ago

Fix DelegateQueueCoordinator

b3ddabda29a5b21d9f4ea529f4a597442f3d6833 authored over 4 years ago

Merge branch 'v6' into feature/v6/pipeline-queue

# Conflicts:
# Bukkit/build.gradle
# Core/src/main/java/com/plotsquared/core/generator/ClassicPl...

b8b3e1e72a0001d2d56b62875fff9cd2f1895745 authored over 4 years ago

update bukkit pom

615a5212bf3231bfb008ebc09e202bfe1485a422 authored over 4 years ago

Fix a few remaining merge issues (+1 squashed commits)

Squashed commits:

[8c6b55dd4] Fix a few remaining merge issues

221d299052adeeb7d5d7107bbd525e13eb59593a authored over 4 years ago

Merge branch 'v5' into v6

# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform....

3180d2ddf2161b5b9161128c4617a1d3e7e0dcfb authored over 4 years ago

Javadoc, some cleanup

7aaa075ba816413e2f1ba7e15c4d030589731855 authored over 4 years ago

Remove all permission related errors

4fb590889ac3b5029ab21c8607c653cc623e6e77 authored over 4 years ago

Remove unused stuff

115ca903b23cabfe6d3ca36f42f840c2e74851f8 authored over 4 years ago

Merge remote-tracking branch 'origin/v6' into feature/v6/json

# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main...

e90170a384ecea2b39cbcbf294e38b71426f15a5 authored over 4 years ago

Formatting, mark nonnull, nullable etc

1d0760c63097189938f6035ee1c2163cbeaf5378 authored over 4 years ago

Add namespaces for translations

af44fe74ffc90cc6ba1abf5f0f10c4f8c3135fba authored over 4 years ago

A couple of reworks

- Redo how regeneration works a little to also take a cuboid region for regeneration off-chunk p...

72c0021306d354d11d0def00c73001c4a75c401f authored over 4 years ago

Fix a couple more Guice issues. Refactor read chunks to be a list of chunks rather than CuboidRegion

18918eb3a31b1816e148fb055a7acd426bf6f8f6 authored over 4 years ago

Merge branch 'v6' into feature/v6/pipeline-queue

416e18199214bad88aeaaf82cddf81fdd274beac authored over 4 years ago

This is not my fault

d7a49e3316df57bbe4a0e2a701e82b78a8954010 authored over 4 years ago

Merge branch 'v6' into feature/v6/pipeline-queue

cf13f13fbf341f9c29783f357031398e598153f4 authored over 4 years ago

Fix permissionprofile initialisation order

f53a8d3b064373213294bf6a46fb4ceedbf179a5 authored over 4 years ago

Merge branch 'v6' into feature/v6/pipeline-queue

8c5c1922c93f9ff39ce93bc95ae25d3bbb50a601 authored over 4 years ago

Merge remote-tracking branch 'origin/v6' into v6

707559e023051db1a4cbcb95eb2016a2c21b5fad authored over 4 years ago

make sure the PlayerMetaDataKeys keys are loaded

97a2ccbfe01cd408f260fa8bf647f6dbc7226d98 authored over 4 years ago

fix version

95f2a7a908f24af22b88d7ce3e1557b8ace4e551 authored over 4 years ago

Merge branch 'v6' into feature/v6/pipeline-queue

# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main...

e53c53bb4ab501628ff4f4ab96670f1fb76a5c74 authored over 4 years ago

Fix some issues I caused with Guice

d906a85095d5f30011cdb4d967f799c70e36fc47 authored over 4 years ago

Ecosyste.ms: OpenCollective

github.com/IntellectualSites/PlotSquared