TotalFreedomMC/TF-Marriage
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-Marriage.git synced 2024-05-20 03:21:22 +00:00
Code Issues Projects Releases Wiki Activity

Release: 2.0.18

Browse source
This commit is contained in:
Lennart ten Wolde 2018-06-05 20:33:11 +02:00
parent 853b73cf32
commit 90efc91e21
4 changed files with 86 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
.idea/workspace.xml
View file

@ -2,9 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6524ab32-4c67-47a4-9559-a55b4c68fe83" name="Default" comment=""> <list default="true" id="6524ab32-4c67-47a4-9559-a55b4c68fe83" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/latest_version.json" beforeDir="false" afterPath="$PROJECT_DIR$/latest_version.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/changelog.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/changelog.json" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -19,17 +19,26 @@
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1071"> <state relative-caret-position="102">
<caret line="81" column="27" selection-start-line="81" selection-start-column="27" selection-end-line="81" selection-end-column="27" /> <caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CommandTeleport.java" pinned="false" current-in-tab="true"> <file leaf-file-name="latest_version.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java"> <entry file="file://$PROJECT_DIR$/latest_version.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="474"> <state relative-caret-position="17">
<caret line="75" column="13" selection-start-line="75" selection-start-column="13" selection-end-line="75" selection-end-column="13" /> <caret line="1" column="29" lean-forward="true" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="changelog.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/changelog.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -56,9 +65,11 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java" /> <option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java" />
<option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java" />
<option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java" /> <option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java" />
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java" /> <option value="$PROJECT_DIR$/latest_version.json" />
<option value="$PROJECT_DIR$/src/main/resources/changelog.json" />
</list> </list>
</option> </option>
</component> </component>
@ -133,6 +144,31 @@
<item name="marriage2" type="462c0819:PsiDirectoryNode" /> <item name="marriage2" type="462c0819:PsiDirectoryNode" />
<item name="commands" type="462c0819:PsiDirectoryNode" /> <item name="commands" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="marriage2" type="b2602c69:ProjectViewProjectNode" />
<item name="Marriage" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="marriage2" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="marriage2" type="b2602c69:ProjectViewProjectNode" />
<item name="Marriage" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="marriage2" type="462c0819:PsiDirectoryNode" />
<item name="misc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="marriage2" type="b2602c69:ProjectViewProjectNode" />
<item name="Marriage" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@ -241,12 +277,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1528215872017</updated> <updated>1528215872017</updated>
<workItem from="1528215876300" duration="5738000" /> <workItem from="1528215876300" duration="6108000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5738000" /> <option name="totallyTimeSpent" value="6108000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" /> <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
@ -261,11 +297,11 @@
<window_info anchor="right" id="Maven Projects" /> <window_info anchor="right" id="Maven Projects" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" /> <window_info anchor="bottom" id="Version Control" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32974634" /> <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32974634" />
<window_info anchor="bottom" id="Terminal" /> <window_info anchor="bottom" id="Terminal" />
<window_info id="Capture Tool" /> <window_info id="Capture Tool" />
<window_info id="Designer" /> <window_info id="Designer" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="right" id="Database" /> <window_info anchor="right" id="Database" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@ -376,20 +412,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-77">
<caret line="56" column="90" selection-start-line="56" selection-start-column="90" selection-end-line="56" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1071">
<caret line="81" column="27" selection-start-line="81" selection-start-column="27" selection-end-line="81" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180527.071454-147-sources.jar!/org/bukkit/block/Block.java"> <entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180527.071454-147-sources.jar!/org/bukkit/block/Block.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282"> <state relative-caret-position="282">
@ -399,11 +421,39 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="474"> <state relative-caret-position="882">
<caret line="75" column="13" selection-start-line="75" selection-start-column="13" selection-end-line="75" selection-end-column="13" /> <caret line="75" column="13" selection-start-line="75" selection-start-column="13" selection-end-line="75" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="680">
<caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/latest_version.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="29" lean-forward="true" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/changelog.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

4
latest_version.json
View file

@ -1,6 +1,6 @@
{ {
"name": "Marriage v2.0.17", "name": "Marriage v2.0.18",
"type": "release", "type": "release",
"gameVersion": "1.8 - 1.12", "gameVersion": "1.8 - 1.12",
"downloadURL": "http://ci.lenis0012.com/job/Marriage/14/artifact/target/Marriage-Spigot-2.0.17.jar" "downloadURL": "http://ci.lenis0012.com/job/Marriage/17/artifact/target/Marriage-Spigot-2.0.18.jar"
} }

2
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>com.lenis0012.bukkit</groupId> <groupId>com.lenis0012.bukkit</groupId>
<artifactId>marriage2</artifactId> <artifactId>marriage2</artifactId>
<version>2.0.18-SNAPSHOT</version> <version>2.0.18</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Marriage</name> <name>Marriage</name>
<url>http://dev.bukkit.org/server-mods/marriage-reloaded/</url> <url>http://dev.bukkit.org/server-mods/marriage-reloaded/</url>

7
src/main/resources/changelog.json
View file

@ -1,11 +1,14 @@
{ {
"version": "Marriage v2.0.17", "version": "Marriage v2.0.18",
"data": "data":
[ [
[ [
"---[ Changelog ]---", "---[ Changelog ]---",
"It's been a while, but here's an update",
"", "",
"- Resolved command error some users were having", "- Added safe teleportation when not in creative",
"",
"- Fixed reported errors"
], ],
[ [
"====[ DONATE ]====", "====[ DONATE ]====",