Merge pull request #36 from NuclearW/master

Changes to pom for getting dependancies from repos + other

.gitignore

@@ -0,0 +1,5 @@
+
+/.project
+/.classpath
+/target
+/.settings

pom.xml

@@ -24,12 +24,43 @@
             <resource>
                 <targetPath>resources</targetPath>
                 <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/</directory>
+                <directory>${basedir}/src/main/resources/xpbar/</directory>
+                <includes>
+                    <include>xpbar*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/healthbar/</directory>
+                <includes>
+                    <include>health*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/skillicon/</directory>
                 <includes>
                     <include>*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/sound/</directory>
+                <includes>
                     <include>*.wav</include>
                 </includes>
             </resource>
+            <resource>
+            	<targetPath>com/gmail/nossr50/locale</targetPath>
+            	<filtering>true</filtering>
+            	<directory>${basedir}/src/main/resources/locale/</directory>
+            	<includes>
+            		<include>locale*.properties</include>
+            	</includes>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -62,31 +93,41 @@
             </plugin>
         </plugins>
     </build>
+    <repositories>
+        <repository>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
+        </repository>
+        <repository>
+        	<id>spout-repo</id>
+        	<url>http://nexus.getspout.org/content/groups/public/</url>
+        </repository>
+    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.0.1-R2-SNAPSHOT</version>
+            <version>1.1-R1</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>craftbukkit</artifactId>
-            <version>1.0.1-R2-SNAPSHOT</version>
+            <version>1.1-R1</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nijikokun.bukkit</groupId>
             <artifactId>Permissions</artifactId>
-            <version>3.2</version>
+            <version>3.1.6</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>ru.tehkode</groupId>
+            <groupId>ru.tehkode.permissions</groupId>
-            <artifactId>PermissionsEx</artifactId>
+            <artifactId>bukkit</artifactId>
             <version>1.18</version>
             <type>jar</type>
             <scope>compile</scope>

src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java

@@ -339,6 +339,7 @@ public class mcPlayerListener extends PlayerListener
 		if(!message.startsWith("/")) return;
 		String command = message.substring(1).split(" ")[0];
 		if(plugin.aliasMap.containsKey(command)) {
+			if(command.equalsIgnoreCase(plugin.aliasMap.get(command))) return;
 			event.setCancelled(true);
 			event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command)));
 		}

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 1.2.08-dev
+version: 1.2.08-dev-2
 softdepend: [Spout]
 author: TheYeti
 description: mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.