Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for 1.12 #277

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+13,786 −13,810
Open

Update for 1.12 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66fae53
Update for 1.12
ethsmith Mar 2, 2018
011f9a8
Fix maven build errors
ethsmith Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions dependency-reduced-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.countercraft</groupId>
<artifactId>Movecraft</artifactId>
<version>3.0</version>
<version>3.0.1</version>
<ciManagement>
<system>jenkins</system>
<url>https://ajcstriker.ci.cloudbees.com/</url>
Expand All @@ -24,15 +24,14 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -149,28 +148,21 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.10.2-R0.1-SNAPSHOT</version>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
<artifactId>bungeecord-chat</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.10.2-R0.1-SNAPSHOT</version>
<scope>system</scope>
<systemPath>C:\Users\Mark Summers\git\Movecraft-3/libs/craftbukkit.jar</systemPath>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.5</version>
<version>1.6</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -179,19 +171,26 @@
<version>2.13.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/craftbukkit.jar</systemPath>
</dependency>
<dependency>
<groupId>com.palmergames</groupId>
<artifactId>Towny</artifactId>
<version>LATEST</version>
<scope>system</scope>
<systemPath>C:\Users\Mark Summers\git\Movecraft-3/libs/Towny.jar</systemPath>
<systemPath>${project.basedir}/libs/Towny.jar</systemPath>
</dependency>
<dependency>
<groupId>com.mewin</groupId>
<artifactId>WGCustomFlags</artifactId>
<version>LATEST</version>
<scope>system</scope>
<systemPath>C:\Users\Mark Summers\git\Movecraft-3/libs/WGCustomFlags.jar</systemPath>
<systemPath>${project.basedir}/libs/WGCustomFlags.jar</systemPath>
</dependency>
</dependencies>
<properties>
Expand Down
10 changes: 5 additions & 5 deletions documentation/build/html/_static/basic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ img.align-right, .figure.align-right, object.align-right {
}

img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
display: block;
margin-left: auto;
margin-right: auto;
}

.align-left {
Expand Down Expand Up @@ -419,7 +419,7 @@ dl.glossary dt {
border: 3px solid red;
}

.footnote:target {
.footnote:target {
background-color: #ffa;
}

Expand Down Expand Up @@ -456,7 +456,7 @@ abbr, acronym {

pre {
overflow: auto;
overflow-y: hidden; /* fixes display issues on Chrome browsers */
overflow-y: hidden; /* fixes display issues on Chrome browsers */
}

td.linenos pre {
Expand Down
35 changes: 24 additions & 11 deletions documentation/build/html/_static/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* :license: BSD, see LICENSE for details.
*
*/

@import url("basic.css");

/* -- page layout ----------------------------------------------------------- */
Expand Down Expand Up @@ -113,8 +112,6 @@ div.sphinxsidebar input {
font-size: 1em;
}



/* -- hyperlink styles ------------------------------------------------------ */

a {
Expand All @@ -131,8 +128,6 @@ a:hover {
text-decoration: underline;
}



/* -- body styles ----------------------------------------------------------- */

div.body h1,
Expand All @@ -150,12 +145,30 @@ div.body h6 {
padding: 3px 0 3px 10px;
}

div.body h1 { margin-top: 0; font-size: 200%; }
div.body h2 { font-size: 160%; }
div.body h3 { font-size: 140%; }
div.body h4 { font-size: 120%; }
div.body h5 { font-size: 110%; }
div.body h6 { font-size: 100%; }
div.body h1 {
margin-top: 0;
font-size: 200%;
}

div.body h2 {
font-size: 160%;
}

div.body h3 {
font-size: 140%;
}

div.body h4 {
font-size: 120%;
}

div.body h5 {
font-size: 110%;
}

div.body h6 {
font-size: 100%;
}

a.headerlink {
color: #c60f0f;
Expand Down
Loading