Fixed conflict fuck up.

Updated readme

Author: Michael Hillcox

README.md

@@ -1,26 +1,30 @@
-## Fgt X-Ray
+# X-Ray Mod
 Minecraft Forge XRay mod
 
-## Feature:
-    - Works with Forge
-    - Awesome GUI
-    - Able to add new ores/blocks
-    - Color selector ( RGB )
+### Supports
+- Minecraft 1.7.10      / 1.9.4
+- Forge 10.13.2.1291    / 12.17.0.2051
 
-Working on: Minecraft 1.7.10 and Forge 10.13.2.1291
+### Feature:
+- Full Support for Forge
+    - Supports versions back from 1.7.10
+- Clean and simple GUI to add blocks
+- Colour RGB Selector
+- Auto adds ores from other mods.
 
-Tested with:
+### Previews:
+![XRAY](http://i.imgur.com/N3KOEaE.png)
 
- - Minecraft Forge 1.7.10
- - FTB: Direwolf20 modpack
+The [Imgur Album](http://imgur.com/a/23dX5)
 
-The rendering is copied off of CJB's MoreInfo mod. Thanks CJB.
+### Contributors:
+|User   | Title / Work Done| Link   |
+|---|---|---|
+|MichaelHillcox   | Main Dev |[https://github.com/MichaelHillcox](https://github.com/MichaelHillcox)
+|mcd1992          | Original Creator| [https://github.com/mcd1992](https://github.com/mcd1992) ([GitLab](https://gitlab.com/mcd1992))
+|BondarenkoArtur | Updater (1.7.10-1.9.4) | [https://github.com/BondarenkoArtur](https://github.com/BondarenkoArtur)
 
-Contributors:
-
-[mcd1992](https://github.com/mcd1992)
-
-[AoKMiKeY](https://github.com/aokmikey)
+> A big thanks CJB for his rendering system.
 
 ## License
 Licensed under the [DBaJ (Don't Be a Jerk) non-commercial care-free license](http://www.dbad-license.org/).

java/com/fgtXray/client/gui/GuiSettings.java

@@ -121,38 +121,39 @@ public void initGui()
 	@Override
 	public void actionPerformed( GuiButton button )
 	{
-		// Called on left click of GuiButton
+			// Called on left click of GuiButton
 		switch(button.id)
 		{
 			case 99: // Print OreDict
 				for ( String name : OreDictionary.getOreNames() ) // Print the ore dictionary.
 				{
-					List<ItemStack> oreStack = OreDictionary.getOres(name);
-					System.out.print(String.format("[OreDict] %-40.40s [%d types] ( ", name, oreStack.size()));
+					List<ItemStack> oreStack = OreDictionary.getOres( name);
+					System.out.print( String.format("[OreDict] %-40.40s [%d types] ( ", name, oreStack.size() ) );
 					StringBuilder idMetaCsv = new StringBuilder();
-					if (oreStack.size() < 1) {
-						List<ItemStack> oreStack = OreDictionary.getOres(name);
-						System.out.print(String.format("[OreDict] %-40.40s [%d types] ( ", name, oreStack.size()));
-						StringBuilder idMetaCsv = new StringBuilder();
-						if (oreStack.size() < 1) {
-							idMetaCsv.append(" )");
-						}
+					if( oreStack.size() < 1 )
+					{
+						idMetaCsv.append( " )" );
+					}
 
-						for (ItemStack stack : oreStack) {
-							if (stack == oreStack.get(oreStack.size() - 1)) {
-								idMetaCsv.append(String.format("%d:%d )", Item.getIdFromItem(stack.getItem()), stack.getItemDamage()));
-							} else {
-								idMetaCsv.append(String.format("%d:%d, ", Item.getIdFromItem(stack.getItem()), stack.getItemDamage()));
-							}
+					for( ItemStack stack : oreStack )
+					{
+						if( stack == oreStack.get( oreStack.size() - 1 ) )
+						{
+							idMetaCsv.append( String.format( "%d:%d )", Item.getIdFromItem( stack.getItem() ), stack.getItemDamage() ) );
+						}
+						else
+						{
+							idMetaCsv.append( String.format( "%d:%d, ", Item.getIdFromItem( stack.getItem() ), stack.getItemDamage() ) );
 						}
-						System.out.println(idMetaCsv.toString());
 					}
+					System.out.println( idMetaCsv.toString() );
+				}
 
-					if (!OresSearch.searchList.isEmpty()) // Print out the searchList.
+				if (!OresSearch.searchList.isEmpty()) // Print out the searchList.
+				{
+					for (OreInfo ore : OresSearch.searchList)
 					{
-						for (OreInfo ore : OresSearch.searchList) {
-							System.out.println(String.format("[Fgt XRay] OreInfo( %s, %d, %d, 0x%x, %b )", ore.oreName, ore.id, ore.meta, ore.color[0], ore.draw));
-						}
+						System.out.println(String.format("[Fgt XRay] OreInfo( %s, %d, %d, 0x%x, %b )", ore.oreName, ore.id, ore.meta, ore.color[0], ore.draw));
 					}
 				}
 				break;
@@ -244,12 +245,12 @@ public boolean doesGuiPauseGame()
     // this removes the stupid power of 2 rule that comes with minecraft.
     private static void drawTexturedQuadFit(double x, double y, double width, double height, double zLevel)
     {
-        VertexBuffer tessellator = Tessellator.getInstance().getBuffer();
-		tessellator.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
-        tessellator.pos(x + 0, y + height, zLevel).tex( 0,1).endVertex();
-        tessellator.pos(x + width, y + height, zLevel).tex( 1, 1).endVertex();
-        tessellator.pos(x + width, y + 0, zLevel).tex( 1,0).endVertex();
-        tessellator.pos(x + 0, y + 0, zLevel).tex( 0, 0).endVertex();
+        VertexBuffer tessellate = Tessellator.getInstance().getBuffer();
+		tessellate.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
+        tessellate.pos(x + 0, y + height, zLevel).tex( 0,1).endVertex();
+        tessellate.pos(x + width, y + height, zLevel).tex( 1, 1).endVertex();
+        tessellate.pos(x + width, y + 0, zLevel).tex( 1,0).endVertex();
+        tessellate.pos(x + 0, y + 0, zLevel).tex( 0, 0).endVertex();
 		Tessellator.getInstance().draw();
     }