Skip to content
This repository was archived by the owner on Nov 10, 2021. It is now read-only.

Commit 5b968c4

Browse files
committed
Merge branch 'develop'
2 parents a0c97ff + 767afe8 commit 5b968c4

File tree

2 files changed

+51
-25
lines changed

2 files changed

+51
-25
lines changed

pom.xml

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.froxynetwork</groupId>
77
<artifactId>FroxyGame</artifactId>
8-
<version>0.0.1</version>
8+
<version>0.0.3</version>
99
<packaging>jar</packaging>
1010

1111
<name>FroxyGame</name>
@@ -25,6 +25,54 @@
2525
</roles>
2626
</developer>
2727
</developers>
28+
<build>
29+
<defaultGoal>clean install</defaultGoal>
30+
<finalName>FroxyCore-${project.version}</finalName>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-compiler-plugin</artifactId>
35+
<version>3.8.0</version>
36+
<configuration>
37+
<source>1.8</source>
38+
<target>1.8</target>
39+
</configuration>
40+
</plugin>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-shade-plugin</artifactId>
44+
<version>3.1.0</version>
45+
<executions>
46+
<execution>
47+
<id>shaded</id>
48+
<phase>package</phase>
49+
<goals>
50+
<goal>shade</goal>
51+
</goals>
52+
<configuration>
53+
<shadedArtifactAttached>false</shadedArtifactAttached>
54+
<createDependencyReducedPom>false</createDependencyReducedPom>
55+
<artifactSet>
56+
<excludes>
57+
<exclude>org.projectlombok:lombok</exclude>
58+
</excludes>
59+
</artifactSet>
60+
<filters>
61+
<filter>
62+
<artifact>*:*</artifact>
63+
<excludes>
64+
<exclude>META-INF/*.SF</exclude>
65+
<exclude>META-INF/*.DSA</exclude>
66+
<exclude>META-INF/*.RSA</exclude>
67+
</excludes>
68+
</filter>
69+
</filters>
70+
</configuration>
71+
</execution>
72+
</executions>
73+
</plugin>
74+
</plugins>
75+
</build>
2876

2977
<!-- Configuration of repositories -->
3078
<repositories>
@@ -35,33 +83,11 @@
3583
</repositories>
3684

3785
<dependencies>
38-
<!-- Logging -->
39-
<dependency>
40-
<groupId>org.slf4j</groupId>
41-
<artifactId>slf4j-api</artifactId>
42-
<version>1.7.26</version>
43-
<scope>compile</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.slf4j</groupId>
47-
<artifactId>slf4j-log4j12</artifactId>
48-
<version>1.7.6</version>
49-
<scope>compile</scope>
50-
</dependency>
51-
52-
<!-- Lombok -->
53-
<dependency>
54-
<groupId>org.projectlombok</groupId>
55-
<artifactId>lombok</artifactId>
56-
<version>1.18.6</version>
57-
<scope>provided</scope>
58-
</dependency>
59-
6086
<!-- Network -->
6187
<dependency>
6288
<groupId>com.github.froxynetwork</groupId>
6389
<artifactId>froxynetwork</artifactId>
64-
<version>0.1.2</version>
90+
<version>0.1.3</version>
6591
</dependency>
6692
</dependencies>
6793
</project>

src/main/java/com/froxynetwork/froxygame/languages/LanguageManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static Language getLanguage(Languages lang) {
105105

106106
/**
107107
* Get the default translate of specific message id.<br />
108-
* Same as <code>get(id, DEFAULT, params)</code>
108+
* Same as <code>$(id, DEFAULT, params)</code>
109109
*
110110
* @param id The id of the message
111111
* @param params The parameters

0 commit comments

Comments
 (0)