Merge branch 'hotfix/0.7.2'

Contributing.md

@@ -0,0 +1,27 @@
+Hey there. Looks like you want to contribute with an issue. Great. Here's what you have to do:
+* Have a look through the [Issue Tracker](https://github.com/Nincraft/NincraftElectricBoogaloo2RevengeoftheFallen/issues), to see if your issue has been solved already;
+* Read through the steps on [Bug Reporting 101](http://vazkii.us/br101/) (You may skip this if you're already familiar with reporting issues, but it's good for newcomers);
+
+* Note the following points:
+  * When reporting an issue, please include the version of the modpack (can be found on the title screen), which launcher you are using, and a link to pastebin with any crash report you have received.
+  * Issues regarding outdated versions of the modpack are **not accepted**;
+  * Duplicate issues or issues that have been solved already (use the search feature!) will be closed without asking.
+  * Do not tag your issues' names. "Something Broke" is prefered to "[Bug] Something Broke"  because there's a proper label system in place.
+  * If you are going to post a suggestion, post one, not a wish list; it’s easier to track and manage that way.
+
+The following "bugs" are not accepted:
+* Intended Behaviour
+  * Constantly dying in the Nether
+* Not a NEB2 problem/Not fixable
+  * Crash on startup with any mod that isn’t [in this list](https://github.com/Nincraft/NincraftElectricBoogaloo2RevengeoftheFallen/blob/master/Versions.md)
+  * Flowers don't render (Optifine issue)
+
+---
+
+If you want to make a Pull Request keep these in mind:
+* Do not use the github editor. Test your PRs before you submit them.
+* Unless you have a very good reason for it, keep your PRs all in one commit. You can do it with [rebase](https://git-scm.com/docs/git-rebase).
+
+---
+
+Thanks to Vazkii for the contributing guidelines. 8/8 gr8 job m8

Permissions.md

@@ -6,6 +6,7 @@
 [Tinkers' Modifiers Curse Page]:http://www.curse.com/mc-mods/minecraft/224971-tinkers-modifiers
 [Witchery MCF Thread]:http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1445248
 [Witchery Notification]:https://i.imgur.com/0pZ3iHy.png
+[Chisel Curse Page]:http://minecraft.curseforge.com/projects/chisel
 
 - **Agricraft** by: *InfinityRaider*
   - **Private Packs**: Open: [FTB Permission Website]
@@ -16,9 +17,6 @@
 - **Another One Bites The Dust** by: *ganymedes01*
   - **Private Packs**: Open: [FTB Permission Website]
   - **Public Packs** : Open: [FTB Permission Website]
-- **Another One Bites The Dust: Berry Bushes** by: *Ganymedes01*
-  - **Private Packs**: Open: [FTB Permission Website]
-  - **Public Packs** : Open: [FTB Permission Website]
 - **AppleCore** by: *Squeek502*
   - **Private Packs**: Open: [FTB Permission Website]
   - **Public Packs** : Open: [FTB Permission Website]
@@ -76,9 +74,9 @@
 - **ChickenChunks** by: *Chickenbones*
   - **Private Packs**: Open: [FTB Permission Website]
   - **Public Packs** : Open: [FTB Permission Website]
-- **Chisel 2** by: *warlordjones, tterrag1098, TheCricket26, Drullkus*
-  - **Private Packs**: Open: [FTB Permission Website]
-  - **Public Packs** : Open: [FTB Permission Website]
+- **Chisel** by: *tterrag, Drullkus, minecreatr*
+  - **Private Packs**: Open: [Chisel Curse Page]
+  - **Public Packs** : Open: [Chisel Curse Page]
 - **Chunkgen** by: *gecgooden*
   - **Private Packs**: Open: [Chunkgen License]
   - **Public Packs** : Open: [Chunkgen License]

Versions.md

@@ -1,6 +1,6 @@
 Current Forge Version
 =
-- **Forge** v10.13.4.1448
+- **Forge** v10.13.4.1558
 
 Current API Versions
 =
@@ -26,10 +26,9 @@ Current API Versions
 
 Current Mod Versions
 =
-- **AgriCraft** v1.7.10-1.4.0-beta-2 by InfinityRaider
+- **AgriCraft** v1.7.10-1.4.5 by InfinityRaider
 - **Alternate Terrain Generation** v0.10.0
 - **Another One Bites The Dust** v2.8.1 by ganymedes01
-- **Another One Bites The Dust: Berry Bushes** v1.0.5 by ganymedes01
 - **Applied Energistics 2** rv2-stable-10 by AlgorithmX2
 - **AppliedEnergistics2 Core** rv2-stable-10 by AlgorithmX2
 - **AromaBackup** v0.0.0.5
@@ -46,7 +45,7 @@ Current Mod Versions
 - **Build Mod** v1.0
 - **Carpenter's Blocks** v3.3.6 by Mineshopper
 - **ChickenChunks** v1.3.4.17 by ChickenBones
-- **Chisel 2** v2.5.0.42 by AUTOMATIC_MAIDEN, Pokefenn, Cricket, tterrag
+- **Chisel** v2.9.3.9 by tterrag, Drullkus, minecreatr
 - **ChunkGen** v1.7.10-1.2.2 by gecgooden
 - **Crafting Pillars Mod** v1.6.0
 - **Decocraft** v2.1 by RazzleberryFox
@@ -102,7 +101,7 @@ Current Mod Versions
 - **NEI Integration** v1.0.12 by tonius11
 - **Nether Ores** v1.7.10R2.3.1RC1 by PowerCrystals, TehKrush, AtomicStryker, skyboy026
 - **Nin's Mod Lister** v1.7.10-1.0.17 by Nincodedo
-- **Nincrafty Things** v1.7.10-0.5.3+26 by Nincodedo
+- **Nincrafty Things** v1.7.10-0.6.1+51 by Nincodedo
 - **Not Enough Items** v1.0.4.107 by ChickenBones
 - **OpenBlocks** v1.4.4
 - **OpenComputers** v1.5.15.31 by Florian 'Sangar' Nuecke, Johannes 'Lord Joda' Lohrer, Everyone who contributed to the mod on Github - thank you!
@@ -114,7 +113,7 @@ Current Mod Versions
 - **Ping** v1.0.2.B6
 - **PiP** v4.0.0
 - **PneumaticCraft** v1.11.0-120
-- **PoorOres** v1.7.10-1.4.8 by Xexanos
+- **PoorOres** v1.7.10-1.4.9 by Xexanos
 - **PortalGun** v4.0.0-beta-5
 - **PTRModelLib** v1.0.0
 - **Railcraft** v9.7.0.0

config/AppliedEnergistics2/AppliedEnergistics2.cfg

@@ -414,11 +414,15 @@ modintegration {
 ##########################################################################################################
 
 orecamouflage {
+    # OreDictionary Names: crystalCertusQuartz
     B:CertusQuartzCrystal=true
     B:CertusQuartzDust=true
     B:EnderDust=true
     B:Flour=true
 
+    # OreDictionary Names: crystalFluix
+    B:FluixCrystal=true
+
     # OreDictionary Names: dustGold
     B:GoldDust=true
 

config/AppliedEnergistics2/Facades.cfg

@@ -2,6 +2,7 @@
 
 agricraft {
     B:channelValve=false
+    B:channelValve.1=false
     B:cropAllium=false
     B:cropBotaniaBlack=false
     B:cropBotaniaBlue=false
@@ -58,6 +59,7 @@ agricraft {
 
 
 aobd {
+    B:blockMeteoricIron=true
     B:blockNincodium=true
     B:blockTitanium=true
     B:orebushAdamantine=false
@@ -1968,6 +1970,21 @@ chisel {
     B:arcane.9=true
     B:autoChisel=false
     B:beacon=false
+    B:beacon.1=false
+    B:beacon.10=false
+    B:beacon.11=false
+    B:beacon.12=false
+    B:beacon.13=false
+    B:beacon.14=false
+    B:beacon.15=false
+    B:beacon.2=false
+    B:beacon.3=false
+    B:beacon.4=false
+    B:beacon.5=false
+    B:beacon.6=false
+    B:beacon.7=false
+    B:beacon.8=false
+    B:beacon.9=false
     B:birchplanks.1=true
     B:birchplanks.10=true
     B:birchplanks.11=true
@@ -2156,12 +2173,18 @@ chisel {
     B:emeraldblock.9=true
     B:endStone=true
     B:endStone.1=true
+    B:endStone.10=true
+    B:endStone.11=true
+    B:endStone.12=true
+    B:endStone.13=true
     B:endStone.2=true
     B:endStone.3=true
     B:endStone.4=true
     B:endStone.5=true
     B:endStone.6=true
     B:endStone.7=true
+    B:endStone.8=true
+    B:endStone.9=true
     B:factoryblock=true
     B:factoryblock.1=true
     B:factoryblock.10=true
@@ -2816,12 +2839,15 @@ chisel {
     B:pumpkin9=false
     B:purpur=true
     B:purpur.1=true
+    B:purpur.10=true
     B:purpur.2=true
     B:purpur.3=true
     B:purpur.4=true
     B:purpur.5=true
     B:purpur.6=true
     B:purpur.7=true
+    B:purpur.8=true
+    B:purpur.9=true
     B:rebel=true
     B:rebel.1=true
     B:rebel.2=true
@@ -2919,6 +2945,22 @@ chisel {
     B:stainedglassbrown.7=true
     B:stainedglassbrown.8=true
     B:stainedglassbrown.9=true
+    B:stainedglassforestry=true
+    B:stainedglassforestry.1=true
+    B:stainedglassforestry.10=true
+    B:stainedglassforestry.11=true
+    B:stainedglassforestry.12=true
+    B:stainedglassforestry.13=true
+    B:stainedglassforestry.14=true
+    B:stainedglassforestry.15=true
+    B:stainedglassforestry.2=true
+    B:stainedglassforestry.3=true
+    B:stainedglassforestry.4=true
+    B:stainedglassforestry.5=true
+    B:stainedglassforestry.6=true
+    B:stainedglassforestry.7=true
+    B:stainedglassforestry.8=true
+    B:stainedglassforestry.9=true
     B:stainedglasslightgray=true
     B:stainedglasslightgray.1=true
     B:stainedglasslightgray.10=true
@@ -4306,6 +4348,7 @@ gardentrees {
     B:thinlog.13237=false
     B:thinlog.13238=false
     B:thinlog.13239=false
+    B:thinlog.13253=false
     B:thinlog.13254=false
     B:thinlog.13255=false
     B:thinlog.13256=false
@@ -4406,6 +4449,7 @@ gardentrees {
     B:thinlog.5045=false
     B:thinlog.5046=false
     B:thinlog.5047=false
+    B:thinlog.5061=false
     B:thinlog.5062=false
     B:thinlog.5063=false
     B:thinlog.5064=false
@@ -4492,6 +4536,7 @@ gardentrees {
     B:thinlog.9141=false
     B:thinlog.9142=false
     B:thinlog.9143=false
+    B:thinlog.9157=false
     B:thinlog.9158=false
     B:thinlog.9159=false
     B:thinlog.9160=false
@@ -4527,6 +4572,7 @@ gardentrees {
     B:thinlog.949=false
     B:thinlog.950=false
     B:thinlog.951=false
+    B:thinlog.965=false
     B:thinlog.966=false
     B:thinlog.967=false
     B:thinlog.968=false
@@ -4594,6 +4640,7 @@ gardentrees {
     B:thinlogfence.13237=false
     B:thinlogfence.13238=false
     B:thinlogfence.13239=false
+    B:thinlogfence.13253=false
     B:thinlogfence.13254=false
     B:thinlogfence.13255=false
     B:thinlogfence.13256=false
@@ -4694,6 +4741,7 @@ gardentrees {
     B:thinlogfence.5045=false
     B:thinlogfence.5046=false
     B:thinlogfence.5047=false
+    B:thinlogfence.5061=false
     B:thinlogfence.5062=false
     B:thinlogfence.5063=false
     B:thinlogfence.5064=false
@@ -4780,6 +4828,7 @@ gardentrees {
     B:thinlogfence.9141=false
     B:thinlogfence.9142=false
     B:thinlogfence.9143=false
+    B:thinlogfence.9157=false
     B:thinlogfence.9158=false
     B:thinlogfence.9159=false
     B:thinlogfence.9160=false
@@ -4815,6 +4864,7 @@ gardentrees {
     B:thinlogfence.949=false
     B:thinlogfence.950=false
     B:thinlogfence.951=false
+    B:thinlogfence.965=false
     B:thinlogfence.966=false
     B:thinlogfence.967=false
     B:thinlogfence.968=false

config/FlaxbeardsSteamPower.cfg

@@ -127,7 +127,7 @@ integration {
     B:"Enable Tinker's Construct"=true
     B:"Enable Twilight Forest"=true
     B:"Railcraft Poor Ore"=false
-    B:"Railcraft Poor Zinc Ore"=true
+    B:"Railcraft Poor Zinc Ore"=false
     B:"[Railcraft] Generate Poor Zinc when RC is installed"=false
     B:"[Thaumcraft] Show control+click to open Thauminomicon messages on TC4 items"=false
 }
@@ -257,15 +257,15 @@ weapons {
     S:"Extra dimensions to generate Zinc in, separate by ;"=
     I:"FSP Villager ID"=694
     B:"Generate Copper"=false
-    B:"Generate Copper in the above extra dimensions"=true
+    B:"Generate Copper in the above extra dimensions"=false
     B:"Generate End Copper"=false
     B:"Generate End Zinc"=false
     B:"Generate Nether Copper"=false
     B:"Generate Nether Zinc"=false
     B:"Generate Overworld Copper"=false
     B:"Generate Overworld Zinc"=false
     B:"Generate Zinc"=false
-    B:"Generate Zinc in the above extra dimensions"=true
+    B:"Generate Zinc in the above extra dimensions"=false
 }
 
 

config/IguanaTinkerTweaks/BlockOverride.cfg

@@ -77,6 +77,7 @@ blocks_pickaxe {
     I:"PoorOres:poor_meutoite_ore:0"=8
     I:"PoorOres:poor_midasium_ore:0"=4
     I:"PoorOres:poor_mithril_ore:0"=5
+    I:"PoorOres:poor_nether_quartz_ore:0"=3
     I:"PoorOres:poor_nickel_ore:0"=2
     I:"PoorOres:poor_orichalcum_ore:0"=5
     I:"PoorOres:poor_osmium_ore:0"=2
@@ -85,7 +86,7 @@ blocks_pickaxe {
     I:"PoorOres:poor_platinum_ore:0"=2
     I:"PoorOres:poor_potash_ore:0"=0
     I:"PoorOres:poor_prometheum_ore:0"=3
-    I:"PoorOres:poor_quartz_ore:0"=2
+    I:"PoorOres:poor_quartz_ore:0"=1
     I:"PoorOres:poor_redstone_ore:0"=2
     I:"PoorOres:poor_rubracium_ore:0"=5
     I:"PoorOres:poor_saltpeter_ore:0"=0
@@ -132,7 +133,7 @@ generaloredict {
     I:Carmot=4
     I:Cassiterite=1
     I:Celenegil=3
-    I:CertusQuartz=2
+    I:CertusQuartz=3
     I:Ceruclase=3
     I:Cinnabar=2
     I:Coal=0
@@ -196,7 +197,7 @@ generaloredict {
     I:Potash=0
     I:Prometheum=3
     I:Pyrite=2
-    I:Quartz=2
+    I:Quartz=1
     I:Quicksilver=5
     I:RedGranite=2
     I:Redstone=2
@@ -260,6 +261,7 @@ oredict {
     I:oreNetherOsmium=4
     I:oreNetherPeridot=4
     I:oreNetherPlatinum=4
+    I:oreNetherQuartz=3
     I:oreNetherRedstone=4
     I:oreNetherRuby=4
     I:oreNetherRutile=9

config/IguanaTinkerTweaks/MaterialOverride.cfg

@@ -314,7 +314,7 @@ materials {
         S:color=gray
         I:durability=250
         D:handleModifier=0.8
-        I:harvestLevel=2
+        I:harvestLevel=3
         I:miningSpeed=800
         I:reinforced=0
         D:shoddy=-1.0
@@ -782,7 +782,7 @@ materials {
         S:color=gray
         I:durability=250
         D:handleModifier=0.8
-        I:harvestLevel=2
+        I:harvestLevel=3
         I:miningSpeed=800
         I:reinforced=0
         D:shoddy=-1.0