mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
Merge remote-tracking branch 'origin/UI' into UI
This commit is contained in:
8
.gitignore
vendored
8
.gitignore
vendored
@@ -47,6 +47,7 @@ shelf/
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
misc.xml
|
||||
|
||||
##############################
|
||||
## Eclipse
|
||||
@@ -101,4 +102,9 @@ build
|
||||
newgamesver-release-V1.jar
|
||||
server.properties
|
||||
gameserver.log.*
|
||||
gameserver.log
|
||||
gameserver.log
|
||||
|
||||
##############################
|
||||
## JPackage
|
||||
##############################
|
||||
jpackage-input
|
||||
@@ -9,7 +9,7 @@
|
||||
<main-class>org.toop.Main</main-class>
|
||||
<maven.compiler.source>25</maven.compiler.source>
|
||||
<maven.compiler.target>25</maven.compiler.target>
|
||||
|
||||
<maven.compiler.release>25</maven.compiler.release>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
<mainClass>org.toop.Main</mainClass>
|
||||
</transformer>
|
||||
</transformers>
|
||||
<finalName>pism</finalName>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
windowTitle=ISY Games Selector
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=Tic Tac Toe
|
||||
mainMenuSelectReversi=Reversi
|
||||
mainMenuSelectTicTacToe=Tic Tac Toe\u5426
|
||||
mainMenuSelectReversi=Reversi\u5426
|
||||
mainMenuSelectSudoku=Sudoku
|
||||
mainMenuSelectBattleship=Battleship
|
||||
mainMenuSelectOther=Other
|
||||
|
||||
24
pom.xml
24
pom.xml
@@ -107,18 +107,18 @@
|
||||
</java>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.14.1</version>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/custom</outputDirectory>
|
||||
<source>25</source>
|
||||
<target>25</target>
|
||||
<release>25</release>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
|
||||
<!-- <version>3.14.1</version>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <outputDirectory>${project.build.directory}/custom</outputDirectory>-->
|
||||
<!-- <source>25</source>-->
|
||||
<!-- <target>25</target>-->
|
||||
<!-- <release>25</release>-->
|
||||
<!-- <encoding>UTF-8</encoding>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user