From 302d089d55e7deabc3bd0eb4e1de8da7257536ce Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Sun, 29 Jun 2014 01:39:56 -0700
Subject: [PATCH] Assembly needs to go after the shader .jar is built.

---
 pom.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9d717b8b..89e1d0efc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -355,24 +355,6 @@
         </configuration>
       </plugin>
 
-      <!-- Assembly builds .zip, etc. -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
-        </configuration>
-        <executions>
-          <execution>
-            <id>release</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Shades -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -396,6 +378,24 @@
         </executions>
       </plugin>
 
+      <!-- Assembly builds .zip, etc. -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
+        </configuration>
+        <executions>
+          <execution>
+            <id>release</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <!-- Release plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>