Merge pull request #5 from Ninja5tyl3/1.7.10

Updates for new server modpack

.gradle/1.5/taskArtifacts/cache.properties

@@ -0,0 +1 @@
+#Fri Feb 13 19:53:02 JST 2015

.gradle/1.5/taskArtifacts/cache.properties.lock

@@ -0,0 +1 @@
+

Configs/AM2/AM2.cfg

@@ -0,0 +1,214 @@
+# Configuration file
+
+##########################################################################################################
+# beta
+#--------------------------------------------------------------------------------------------------------#
+# This applies to those who have beta auras unlocked only
+##########################################################################################################
+
+beta {
+    D:AuraAlpha=1.0
+    I:AuraBehaviour=0
+    I:AuraColor=16777215
+    B:AuraColorDefault=true
+    B:AuraColorRandomize=true
+    I:AuraDelay=5
+    I:AuraQuantity=1
+    D:AuraScale=1.0
+    D:AuraSpeed=0.02
+    I:AuraType=15
+}
+
+
+##########################################################################################################
+# enchantments
+#--------------------------------------------------------------------------------------------------------#
+# Allows control over various enchantments in the mod.
+##########################################################################################################
+
+enchantments {
+    I:magic_resist=100
+    I:soulbound=101
+}
+
+
+general {
+    # If true, AM2 will automatically download compendium updates when available for your mod version.
+    B:Allow_Compendium_Updates=true
+
+    # If true, AM2 will notify you via the compendium when new versions are available.  It will not spam chat on login.  You will not be notified of updates that are not for your current Minecraft version.
+    B:Allow_Version_Checks=true
+
+    # Comma-separated list of block IDs that appropriation cannot pick up.
+    S:Appropriation_Block_Blacklist=
+
+    # Comma-separated list of *fully qualified* Entity class names that appropriation cannot pick up - example, am2.entities.EntityDryad.  They are case sensitive.
+    S:Appropriation_Mob_Blacklist=
+
+    # Alter this to change the rate at which armor XP infuses.
+    D:Armor_XP_Infusion_Factor=1.0
+
+    # Set this to false to disable candles being able to act as roving lights, which improves performance.
+    B:CandlesAreRovingLights=true
+
+    # Set this to true to have AM2 list out colours for skill points and essence types rather than showing them as a colour.
+    B:ColourblindMode=false
+
+    # How much the damage in Ars Magica is scaled.
+    D:DamageMultiplier=1.0
+
+    # Can the dig component break blocks that have a tile entity?
+    B:DigBreaksTileEntities=true
+
+    # This will toggle mana display on and off in your inventory.  Default 'O' key in game.
+    B:DisplayManaInInventory=false
+    I:EverstoneRepairRate=180
+
+    # Set this to true to have the forge component smelt villagers into emeralds.  This counts as an attack and lowers your reputation.
+    B:ForgeSmeltsVillagers=true
+
+    # This is the multiplier used to determine velocity lost when a spell projectile bounces. 0.0 is a complete stop, 1.0 is no loss.
+    D:FrictionCoefficient=0.8
+
+    # Set this to false in order to disable gateways sending you partial distances if you don't have enough power.
+    B:Hazardous_Gateways=true
+
+    # Sets the maximum mana a player can have (0 for no cap)
+    I:Mana_Cap=0
+
+    # You must reach this magic level before Moonstone meteors will fall near you.
+    I:Meteor_Spawn_Min_Level=10
+
+    # Set this to true to allow AM2 to get random spell names from Seventh Sanctum, and suggest them when naming spells.  Naturally, an internet connection is required.  Keep in mind, while I try to keep things family friendly, it's possible that not all names generated are so.
+    B:MoonstoneMeteorDestroyTerrain=true
+    B:NPC_Spells_Destroy_Terrain=false
+
+    # Set this to false if you are experiencing tick lage due to AM2 saving power data alongside the world save.  This will instead cache the power data in memory to be saved later.  This comes with more risk in the event of a crash, and a larger memory footprint, but increased performance. Can be used alongside chunk unload save config. Power data is still always saved at world unload (server shutdown).
+    B:PND_File_WSave=true
+    B:Player_Spells_Destroy_Terrain=true
+
+    # Set this to true to enable retroactive worldgen for Ars Magica structures and ores.  *WARNING* This may break your save!  Do a backup first!  Note: This will automatically turn off after running the game once.
+    B:RetroactiveWorldGen=false
+
+    # Sets how far a player may progress into secondary skill trees.
+    I:SecondarySkillTreeTierCap=99
+
+    # Set this to false to have the compendium show everything, and not unlock as you go.
+    B:"Staged Compendium"=true
+
+    # Render spell effects on equipped scrolls rather than the scroll itself (only applies to the in-game one, the one on your hotbar remains unchanged)
+    B:Use_Special_Renderers=true
+    I:WitchwoodForestBiomeID=100
+
+    # Disable this if you experience low FPS in witchwood forests
+    B:WitchwoodLeafParticles=true
+
+    # Comma-separated list of block IDs that dig cannot break.  If a block is flagged as unbreackable in code, Dig will already be unable to break it.  There is no need to set it here (eg, bedrock, etc.).  Dig also makes use of Forge block harvest checks.  This is mainly for fine-tuning.
+    S:dig_blacklist=
+
+    # If false, disarm won't work on players.
+    B:disarm_affects_players=true
+    I:mage_villager_profession_id=29
+
+    # Comma-separated list of dimension IDs that AM should *not* do worldgen in.
+    S:worldgen_blacklist=-27,-28,-29
+}
+
+
+guis {
+    D:AffinityPositionX=0.9770833253860474
+    D:AffinityPositionY=0.9
+    D:ArmorPositionBootsX=0.004166666883975267
+    D:ArmorPositionBootsY=0.6352941393852234
+    D:ArmorPositionChestX=0.004166666883975267
+    D:ArmorPositionChestY=0.5568627715110779
+    D:ArmorPositionHeadX=0.004166666883975267
+    D:ArmorPositionHeadY=0.5176470875740051
+    D:ArmorPositionLegsX=0.004166666883975267
+    D:ArmorPositionLegsY=0.5960784554481506
+    D:BuffsNegativePositionX=0.46666666865348816
+    D:BuffsNegativePositionY=0.47843137383461
+    D:BuffsPositivePositionX=0.5145833492279053
+    D:BuffsPositivePositionY=0.47843137383461
+    D:BurnoutHudPositionX=0.13333334028720856
+    D:BurnoutHudPositionY=0.9176470637321472
+    D:BurnoutNumericX=0.21041665971279144
+    D:BurnoutNumericY=0.9058823585510254
+    D:ContingencyPositionX=0.0020833334419876337
+    D:ContingencyPositionY=0.9333333373069763
+    D:LevelPositionX=0.49791666865348816
+    D:LevelPositionY=0.8117647171020508
+    D:ManaHudPositionX=0.7104166746139526
+    D:ManaHudPositionY=0.9137254953384399
+    D:ManaNumericX=0.7437499761581421
+    D:ManaNumericY=0.8941176533699036
+    B:ShowArmorUI=true
+    B:ShowBuffTimers=true
+    B:ShowHUDBars=true
+
+    # Set this to true to only show the AM HUD when a spell is equipped
+    B:ShowHudMinimally=false
+    B:ShowNumericValues=false
+    B:ShowXPAlways=false
+    I:SpellBookX=0
+    I:SpellBookY=0
+    D:XPBarPositionX=0.31041666865348816
+    D:XPBarPositionY=0.7843137383460999
+    D:XPNumericX=0.47083333134651184
+    D:XPNumericY=0.7450980544090271
+}
+
+
+##########################################################################################################
+# mobs
+#--------------------------------------------------------------------------------------------------------#
+# Spawn control for different AM mobs.
+##########################################################################################################
+
+mobs {
+    I:DarklingSpawnRate=5
+    I:DryadSpawnRate=5
+    I:EarthElementalSpawnRate=2
+    I:FireElementalSpawnRate=2
+    I:FlickerSpawnRate=2
+    I:HecateSpawnRate=2
+    I:MageSpawnRate=1
+    I:ManaCreeperSpawnRate=3
+    I:ManaElementalSpawnRate=2
+    I:WaterElementalSpawnRate=3
+}
+
+
+potions {
+    I:agility=48
+    I:astraldistortion=51
+    I:burnoutredux=63
+    I:charmed=39
+    I:chronoanchor=41
+    I:clarity=61
+    I:entangled=43
+    I:featherfall=34
+    I:flight=33
+    I:frostslow=40
+    I:fury=53
+    I:gravitywell=59
+    I:haste=35
+    I:illuminated=55
+    I:leap=49
+    I:levitation=60
+    I:magicshield=38
+    I:manaboost=50
+    I:manaregen=42
+    I:manashield=52
+    I:regeneration=37
+    I:scramblesynapses=54
+    I:shrunken=62
+    I:silence=46
+    I:spellreflect=45
+    I:swiftswim=47
+    I:truesight=36
+    I:waterbreathing=32
+    I:waterygrave=44
+}
+
+

Configs/AM2/SkillConf.cfg

@@ -0,0 +1,132 @@
+# Configuration file
+
+##########################################################################################################
+# general
+#--------------------------------------------------------------------------------------------------------#
+# Set any of these to false to disable the skill in-game.
+##########################################################################################################
+
+general {
+    B:Accelerate=true
+    B:AffinityGains=true
+    B:AoE=true
+    B:Appropriation=true
+    B:AstralDistortion=true
+    B:Attract=true
+    B:AugmentedCasting=true
+    B:BanishRain=true
+    B:Beam=true
+    B:Binding=true
+    B:Blind=true
+    B:Blink=true
+    B:Blizzard=true
+    B:Bounce=true
+    B:BuffPower=true
+    B:Chain=true
+    B:Channel=true
+    B:Charm=true
+    B:ChronoAnchor=true
+    B:Colour=true
+    B:Contingency_Damage=true
+    B:Contingency_Death=true
+    B:Contingency_Fall=true
+    B:Contingency_Fire=true
+    B:Contingency_Health=true
+    B:CreateWater=true
+    B:Damage=true
+    B:Daylight=true
+    B:Dig=true
+    B:Disarm=true
+    B:Dismembering=true
+    B:Dispel=true
+    B:DivineIntervention=true
+    B:Drought=true
+    B:Drown=true
+    B:Duration=true
+    B:EnderIntervention=true
+    B:Entangle=true
+    B:ExtraSummon=true
+    B:FallingStar=true
+    B:FeatherTouch=true
+    B:FireDamage=true
+    B:FireRain=true
+    B:Flight=true
+    B:Fling=true
+    B:Forge=true
+    B:Freeze=true
+    B:FrostDamage=true
+    B:Fury=true
+    B:Gravity=true
+    B:GravityWell=true
+    B:Grow=true
+    B:HarvestPlants=true
+    B:Haste=true
+    B:Heal=true
+    B:Healing=true
+    B:Ignition=true
+    B:Invisibility=true
+    B:Knockback=true
+    B:Leap=true
+    B:Levitate=true
+    B:LifeDrain=true
+    B:LifeTap=true
+    B:Light=true
+    B:LightningDamage=true
+    B:Lunar=true
+    B:MageBandI=true
+    B:MageBandII=true
+    B:MagicDamage=true
+    B:ManaDrain=true
+    B:ManaLink=true
+    B:ManaRegenI=true
+    B:ManaRegenII=true
+    B:ManaRegenIII=true
+    B:ManaShield=true
+    B:Mark=true
+    B:MiningPower=true
+    B:Moonrise=true
+    B:NightVision=true
+    B:PhysicalDamage=true
+    B:Piercing=true
+    B:PlaceBlock=true
+    B:Plant=true
+    B:Plow=true
+    B:Projectile=true
+    B:Prosperity=true
+    B:Radius=true
+    B:RandomTeleport=true
+    B:Range=true
+    B:Recall=true
+    B:Reflect=true
+    B:Regeneration=true
+    B:Repel=true
+    B:Rift=true
+    B:Rune=true
+    B:RuneProcs=true
+    B:Self=true
+    B:Shield=true
+    B:Shrink=true
+    B:Silence=true
+    B:Slow=true
+    B:Slowfall=true
+    B:Solar=true
+    B:Speed=true
+    B:SpellMotion=true
+    B:Storm=true
+    B:Summon=true
+    B:SwiftSwim=true
+    B:TargetNonSolid=true
+    B:Telekinesis=true
+    B:Touch=true
+    B:Transplace=true
+    B:TrueSight=true
+    B:VelocityAdded=true
+    B:Wall=true
+    B:WaterBreathing=true
+    B:WateryGrave=true
+    B:Wave=true
+    B:WizardsAutumn=true
+    B:Zone=true
+}
+
+