-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/Dev'
Conflicts: src/tppitweaks/client/gui/modGuides/GuiGuideBase.java
- Loading branch information
Showing
64 changed files
with
4,419 additions
and
3,547 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,35 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry combineaccessrules="false" kind="src" path="/Minecraft"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/industrialcraft-2-dev-deobf_2.0.336-experimental.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/AM2_1.1.1c.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/BigReactors-0.2.10A.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/buildcraft-A-1.6.2-4.1.2.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/CodeChickenCore-dev 0.9.0.7.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/CodeChickenLib-dev-1.6.4-1.0.0.36.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/dimensional-anchor-57.1.9.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/EnderStorage-dev 1.4.3.5.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/ExU_1.0.3_dev_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/gregtechmod.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/immibis-core-57.1.8.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/magical_crops_1.6.4_3.1.6.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/NotEnoughItems-dev 1.6.1.8.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/OpenBlocks-1.2.2.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/RedstoneArsenal-1.0.0.0.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/scala-library-2.10.2.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/ThermalExpansion-3.0.0.0.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/powersuitaddons-1.6.4-884_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/jars/mods/CoFHCore-2.0.0.0.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/jars/mods/StevesFactoryManagerA32.zip"/> | ||
| <classpathentry kind="lib" path="/EnderIO/lib/NotEnoughItems-dev 1.6.1.4.jar"/> | ||
| <classpathentry combineaccessrules="false" kind="src" path="/Mekanism"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/DartCraft Beta 0.2.15_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/Mariculture-1.6.X-v1.1.4e_deobf.zip"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/Reliquary-1.6.4-1.1-TPPI_deobf.jar"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry combineaccessrules="false" kind="src" path="/Minecraft"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/industrialcraft-2-dev-deobf_2.0.336-experimental.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/AM2_1.1.1c.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/BigReactors-0.2.10A.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/buildcraft-A-1.6.2-4.1.2.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/CodeChickenCore-dev 0.9.0.7.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/CodeChickenLib-dev-1.6.4-1.0.0.36.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/dimensional-anchor-57.1.9.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/EnderStorage-dev 1.4.3.5.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/gregtechmod.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/immibis-core-57.1.8.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/NotEnoughItems-dev 1.6.1.8.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/OpenBlocks-1.2.2.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/RedstoneArsenal-1.0.0.0.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/scala-library-2.10.2.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/ThermalExpansion-3.0.0.0.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/powersuitaddons-1.6.4-884_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/jars/mods/CoFHCore-2.0.0.0.jar"/> | ||
| <classpathentry kind="lib" path="/EnderIO/lib/NotEnoughItems-dev 1.6.1.4.jar"/> | ||
| <classpathentry combineaccessrules="false" kind="src" path="/Mekanism"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/DartCraft Beta 0.2.15_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/Mariculture-1.6.X-v1.1.4e_deobf.zip"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/Reliquary-1.6.4-1.1-TPPI_deobf.jar"/> | ||
| <classpathentry combineaccessrules="false" kind="src" path="/TinkersConstruct"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/ExU_1.0.3a_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/Magical_crops_1.6.4_3.2.0_BETA_15a_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/advancedGenetics_v1.4.1.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/Railcraft_1.6.4-8.4.0.0_deobf.jar"/> | ||
| <classpathentry kind="lib" path="E:/Development/Let's Mod/development/forge/mcp/lib/StevesFactoryManagerA78.jar"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /bin | ||
| *.classpath | ||
|
|
||
|
|
||
| build.properties |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>TPPI-Tweaks</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>TPPI-Tweaks</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| # Example build.properties file. Feel free to set these values to meet your needs on your system. | ||
| # | ||
| # dir.mc : Not Required. I use it as a base folder for other properties. This is where all my MC related stuff lives. | ||
| dir.mc= | ||
| # forge.version : Not Required. This is the path of the folder under my ${dir.mc} folder that I extract the Forge source distribution to. | ||
| forge.version=965 | ||
| # dir.forge : Not Required. The path to the forge folder extracted from the Forge source distribution. I use it in subsequent properties. | ||
| dir.forge=E:/Development/Let's Mod/development/forge | ||
| # | ||
| # dir.project : Required. This is the folder that you pulled the TreeCapitator repo to. | ||
| dir.project=E:/Development/Let's Mod/development/eclipse/TPPI-Tweaks | ||
| # dir.core.project : Required. This is the folder that you pulled the bspkrsCore repo to. | ||
| dir.core.project= | ||
| # dir.mcp : Required. The path to the mcp folder created by Forge when running install.cmd or install.sh. | ||
| dir.mcp=E:/Development/Let's Mod/development/forge/mcp | ||
| # dir.release : Required. The target path where the .jar/.zip files will be created. | ||
| # Example build.properties file. Feel free to set these values to meet your needs on your system. | ||
| # | ||
| # dir.mc : Not Required. I use it as a base folder for other properties. This is where all my MC related stuff lives. | ||
| dir.mc= | ||
| # forge.version : Not Required. This is the path of the folder under my ${dir.mc} folder that I extract the Forge source distribution to. | ||
| forge.version=965 | ||
| # dir.forge : Not Required. The path to the forge folder extracted from the Forge source distribution. I use it in subsequent properties. | ||
| dir.forge=E:/Development/Let's Mod/development/forge | ||
| # | ||
| # dir.project : Required. This is the folder that you pulled the TreeCapitator repo to. | ||
| dir.project=E:/Development/Let's Mod/development/eclipse/TPPI-Tweaks | ||
| # dir.core.project : Required. This is the folder that you pulled the bspkrsCore repo to. | ||
| dir.core.project= | ||
| # dir.mcp : Required. The path to the mcp folder created by Forge when running install.cmd or install.sh. | ||
| dir.mcp=E:/Development/Let's Mod/development/forge/mcp | ||
| # dir.release : Required. The target path where the .jar/.zip files will be created. | ||
| dir.release=E:/Mod Builds |
Oops, something went wrong.