Skip to content

Commit 2a474fa

Browse files
EsophoseEsophose
authored
Merge pull request #17 from Esophose/v6.4
v6.4
2 parents 3a95de9 + 0006946 commit 2a474fa

File tree

63 files changed

+2137
-2218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2137
-2218
lines changed

‎.gitignore‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ $RECYCLE.BIN/
2121
# OSX
2222
# =========================
2323

24-
.DS_Store
25-
.AppleDouble
26-
.LSOverride
27-
28-
# Icon must end with two \r
29-
Icon
30-
31-
# Thumbnails
24+
.DS_Store
25+
.AppleDouble
26+
.LSOverride
27+
28+
# Icon must end with two \r
29+
Icon
30+
31+
32+
# Thumbnails
3233
._*
3334

3435
# Personal stuff
@@ -38,16 +39,19 @@ Icon
3839
/.settings
3940
/doc
4041
/target
41-
/images
42-
43-
# Files that might appear on external disk
44-
.Spotlight-V100
45-
.Trashes
46-
47-
# Directories potentially created on remote AFP share
48-
.AppleDB
49-
.AppleDesktop
50-
Network Trash Folder
51-
Temporary Items
52-
.apdisk
53-
images/
42+
/images
43+
/build
44+
/.idea
45+
46+
# Files that might appear on external disk
47+
.Spotlight-V100
48+
.Trashes
49+
50+
# Directories potentially created on remote AFP share
51+
.AppleDB
52+
.AppleDesktop
53+
Network Trash Folder
54+
Temporary Items
55+
.apdisk
56+
images/
57+
*.iml

‎changelog.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
== UPDATING WILL DELETE YOUR CONFIG.YML ==
22
* Create a backup of your config.yml if you wish to import all your old settings!
3+
=== v6.4 ===
4+
+ Added support for Minecraft 1.14
5+
+ Added 1.14 effects: 'campfire_cosy_smoke', 'campfire_signal_smoke', 'composter', 'falling_lava', 'falling_water', 'landing_lava', 'sneeze'
6+
+ Added pages for effects, styles, and data in the GUI
7+
+ Added setting 'gui-close-after-group-selected' to the config.yml
8+
+ Added setting 'gui-presets-only' to the config.yml
9+
+ Added Vietnamese translation file (vi_VN.lang)
10+
+ Added support for vanish plugins as long as they use the Spigot hidden player API properly
11+
* Fixed a whole bunch of errors in the fr_FR.lang file
12+
* Fixed '/pp add' item data parameter being ignored
13+
* Fixed an error with the GUI chat hook for creating a new group in 1.9
14+
* Fixed players being able to load saved groups they no longer have permission for
15+
* Fixed support for newline characters in GUI messages in some cases
316
=== v6.3 ===
417
+ Added the ability to remove particles by id/effect/style using '/pp remove <id>|<effect>|<style>'
518
+ Added new styles 'popper', 'pulse', 'twins', 'whirl', and 'whirlwind'

‎pom.xml‎

Lines changed: 11 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.esophose.playerparticles</groupId>
44
<artifactId>PlayerParticles</artifactId>
5-
<version>6.3</version>
5+
<version>6.4</version>
66
<name>PlayerParticles</name>
77
<url>https://github.com/Esophose/PlayerParticles</url>
8-
<description>Display particles around your player using customized styles and data!</description>
8+
<description>Display particles around your player and blocks using customized styles and data!</description>
99
<build>
1010
<sourceDirectory>src</sourceDirectory>
1111
<resources>
@@ -31,7 +31,7 @@
3131
<version>3.1.0</version>
3232
<executions>
3333
<execution>
34-
<id>1.13</id>
34+
<id>shaded</id>
3535
<phase>package</phase>
3636
<goals>
3737
<goal>shade</goal>
@@ -42,6 +42,7 @@
4242
<include>com.zaxxer:HikariCP</include>
4343
<include>org.slf4j:slf4j-api</include>
4444
<include>org.slf4j:slf4j-nop</include>
45+
<include>com.googlecode.json-simple:json-simple</include>
4546
</includes>
4647
</artifactSet>
4748
<filters>
@@ -54,115 +55,7 @@
5455
</excludes>
5556
</filter>
5657
</filters>
57-
<outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.13\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
58-
</configuration>
59-
</execution>
60-
<execution>
61-
<id>1.12</id>
62-
<phase>package</phase>
63-
<goals>
64-
<goal>shade</goal>
65-
</goals>
66-
<configuration>
67-
<artifactSet>
68-
<includes>
69-
<include>com.zaxxer:HikariCP</include>
70-
<include>org.slf4j:slf4j-api</include>
71-
<include>org.slf4j:slf4j-nop</include>
72-
</includes>
73-
</artifactSet>
74-
<filters>
75-
<filter>
76-
<artifact>*:*</artifact>
77-
<excludes>
78-
<exclude>META-INF/*.SF</exclude>
79-
<exclude>META-INF/*.DSA</exclude>
80-
<exclude>META-INF/*.RSA</exclude>
81-
</excludes>
82-
</filter>
83-
</filters>
84-
<outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.12\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
85-
</configuration>
86-
</execution>
87-
<execution>
88-
<id>1.11</id>
89-
<phase>package</phase>
90-
<goals>
91-
<goal>shade</goal>
92-
</goals>
93-
<configuration>
94-
<artifactSet>
95-
<includes>
96-
<include>com.zaxxer:HikariCP</include>
97-
<include>org.slf4j:slf4j-api</include>
98-
<include>org.slf4j:slf4j-nop</include>
99-
</includes>
100-
</artifactSet>
101-
<filters>
102-
<filter>
103-
<artifact>*:*</artifact>
104-
<excludes>
105-
<exclude>META-INF/*.SF</exclude>
106-
<exclude>META-INF/*.DSA</exclude>
107-
<exclude>META-INF/*.RSA</exclude>
108-
</excludes>
109-
</filter>
110-
</filters>
111-
<outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.11\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
112-
</configuration>
113-
</execution>
114-
<execution>
115-
<id>1.10</id>
116-
<phase>package</phase>
117-
<goals>
118-
<goal>shade</goal>
119-
</goals>
120-
<configuration>
121-
<artifactSet>
122-
<includes>
123-
<include>com.zaxxer:HikariCP</include>
124-
<include>org.slf4j:slf4j-api</include>
125-
<include>org.slf4j:slf4j-nop</include>
126-
</includes>
127-
</artifactSet>
128-
<filters>
129-
<filter>
130-
<artifact>*:*</artifact>
131-
<excludes>
132-
<exclude>META-INF/*.SF</exclude>
133-
<exclude>META-INF/*.DSA</exclude>
134-
<exclude>META-INF/*.RSA</exclude>
135-
</excludes>
136-
</filter>
137-
</filters>
138-
<outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.10\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
139-
</configuration>
140-
</execution>
141-
<execution>
142-
<id>1.9</id>
143-
<phase>package</phase>
144-
<goals>
145-
<goal>shade</goal>
146-
</goals>
147-
<configuration>
148-
<artifactSet>
149-
<includes>
150-
<include>com.zaxxer:HikariCP</include>
151-
<include>org.slf4j:slf4j-api</include>
152-
<include>org.slf4j:slf4j-nop</include>
153-
</includes>
154-
</artifactSet>
155-
<filters>
156-
<filter>
157-
<artifact>*:*</artifact>
158-
<excludes>
159-
<exclude>META-INF/*.SF</exclude>
160-
<exclude>META-INF/*.DSA</exclude>
161-
<exclude>META-INF/*.RSA</exclude>
162-
</excludes>
163-
</filter>
164-
</filters>
165-
<outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.9\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
58+
<outputFile>./target/PlayerParticles_v${project.version}.jar</outputFile>
16659
</configuration>
16760
</execution>
16861
</executions>
@@ -200,10 +93,15 @@
20093
<artifactId>sqlite-jdbc</artifactId>
20194
<version>3.23.1</version>
20295
</dependency>
96+
<dependency>
97+
<groupId>com.googlecode.json-simple</groupId>
98+
<artifactId>json-simple</artifactId>
99+
<version>1.1.1</version>
100+
</dependency>
203101
<dependency>
204102
<groupId>org.spigotmc</groupId>
205103
<artifactId>spigot-api</artifactId>
206-
<version>1.13.2-R0.1-SNAPSHOT</version>
104+
<version>1.14-R0.1-SNAPSHOT</version>
207105
</dependency>
208106
</dependencies>
209107
</project>

0 commit comments

Comments
 (0)