@@ Line 28: / Line 28: @@
 ==Mining Barge==
-Mining barges are the first level of ORE mining ships. There are three mining barges, each optimised for a different role.
+Mining barges are the first level of ORE mining ships. There are three mining barges, each optimized for a different role.
+=== Procurer ===
+Since the Inferno 1.2 patch, the Procurer has become a very respectable mining ship due to its combination of decent yield, good ore hold, great tank, and low cost. The Procurer's ore hold is larger than a Covetor, smaller than a Retriever, but can still fit several cycles worth of ore. The Procurer's base mining yield is the lowest of all the ORE ships, but has been improved significantly to be on par with other ORE mining ships. The procurer's tank is beat only by its T2 varient, the Skiff. Using inexpensive modules, the procurer can reach enormous EHP while still maintaining a respectable yield and is thus the safest ship for mining in the lower-security (.6 or .5) areas of high security space.
+{{Ship|Procurer|box}}
-{{Ship|Covetor|box}}
-The Covetor has the greatest mining yield out of the T1 mining barges, but has the smallest ore hold and the least tank. As a result, you need support from another pilot to be effective at your role, as you waste the time saved mining trying to haul the ore back to your drop off point.
+</noinclude>{{#ifeq:{{{1|Procurer}}}|Procurer|
-</noinclude>{{#ifeq:{{{1|Covetor}}}|Covetor|
-{{ShipFitting|
-ship=Covetor|
-shipTypeID=17476|
-fitName=Hisec Mining|
-fitID=Hisec-Mining|
-high1name=Strip Miner I|
-high1typeID=17482|
-high2name=Strip Miner I|
-high2typeID=17482|
-high3name=Strip Miner I|
-high3typeID=17482|
-mid1name=Survey Scanner I|
-mid1typeID=444|
-low1name=Mining Laser Upgrade I|
-low1typeID=22542|
-low2name=Mining Laser Upgrade I|
-low2typeID=22542|
-drone1name=Mining Drone I x5|
-drone1typeID=10246|
-drone2name=Warrior I x5|
-drone2typeID=2486|
-drone3name=open|
-drone4name=open|
-drone5name=open|
-rig1name=open|
-rig2name=open|
-rig3name=open|
-difficulty=0|
-warsop=A|
-warsopReason=|
-version=PRE-RET 1.0|
-shipDNA=17476:17482;3:444;1:22542;2:2486;5:10246;5::|
-skills=Mining Barge V</li><li>Astrogeology V</li><li>Electronics IV</li><li>Drones V</li><li>Combat Drone Operation III</li><li>Drone Durability III</li><li>Drone Interfacing III</li><li>Hull Upgrades II</li><li>Mining Upgrades IV</li><li>Shield Upgrades I</li><li>Scout Drone Operation III</li><li>Drones III|
-notes=The Cargohold Optimisation rigs of past fits are no longer beneficial to the Ore Hold (introduced in Inferno 1.2). Rig slots are now available for other purposes (e.g. Defence).}}
 {{ShipFitting|
-ship=Covetor|
+ship=Procurer|
-shipTypeID=17476|
+shipTypeID=17480|
-fitName=T1 Hisec Mining - tankier version|
+fitName=Tanked mining (T1)|
-fitID=T1-Hisec-Mining---tankier-version|
+fitID=TankedT1|
 high1name=Strip Miner I|
 high1typeID=17482|
-high2name=Strip Miner I|
+mid1name=ML-3 Amphilotite Mining Probe|
-high2typeID=17482|
+mid1typeID=6567|
-high3name=Strip Miner I|
+mid2name=Limited Adaptive Invulnerability Field I|
-high3typeID=17482|
+mid2typeID=9632|
-mid1name=Adaptive Invulnerability Field I|
+mid3name=Limited Adaptive Invulnerability Field I|
-mid1typeID=578|
+mid3typeID=9632|
-low1name=Damage Control I|
+mid4name=Medium Azeotropic Ward Salubrity I|
-low1typeID=2046|
+mid4typeID=8433|
+low1name=Emergency Damage Control|
+low1typeID=5841|
 low2name=Mining Laser Upgrade I|
 low2typeID=22542|
-drone1name=Mining Drone I x5|
+drone1name=Hornet EC-300 x3|
-drone1typeID=10246|
+drone1typeID=23707|
-drone2name=Warrior I x5|
+drone2name=Hobgoblin I x2|
-drone2typeID=2486|
+drone2typeID=2454|
 drone3name=open|
 drone4name=open|
@@ Line 97: / Line 69: @@
 rig2name=Medium Core Defense Field Extender I|
 rig2typeID=31790|
-rig3name=Medium Anti-EM Screen Reinforcer I|
+rig3name=Medium Core Defense Field Extender I|
-rig3typeID=31718|
+rig3typeID=31790|
-difficulty=1|
+difficulty=0|
 warsop=A|
 warsopReason=|
-version=RUBI 1.0|
+version=RUB 1.0|
-shipDNA=17476:17482;3:578;1:2046;1:22542;1:31718;1:31790;2:2486;5:10246;5::|
+shipDNA=17480:17482;1:6567;1:9632;2:8433;1:5841;1:22542;1:31790;3:23707;3:2454;2::|
 skills=|
-notes=If you have problems with CPU, swap one of the Medium Core Defense Field Extenders for a Medium Processor Overclocking Unit, though it might be better to get your CPU skills a bit up instead}}
+notes=A buffer of 63,670 EHP against Antimatter makes suicide ganks against this ship extremely unprofitable.</li><li>Even at maximum skills, the Procurer is still a slow ship at 113 m/s. Use of a bounce bookmark that is on grid with the asteroid belt is recommended.</li><li>Two Hobgoblin I drones should be sufficient to dispatch all high-sec belt rats with ease. The EC-300 drones are added to provide further security against suicide ganking. If you have done nothing to make yourself a target, you can likely replace them with Mining Drone Is or further Hobgoblin Is.}} {{ShipFitting|
+ship=Procurer|
-{{ShipFitting|
+shipTypeID=17480|
-ship=Covetor|
+fitName=Tanked mining (T2)|
-shipTypeID=17476|
+fitID=TankedT2|
-fitName=T2 Strips|
-fitID=T2-Strips|
 high1name=Modulated Strip Miner II|
 high1typeID=17912|
-high2name=Modulated Strip Miner II|
+mid1name=Thermic Dissipation Field II|
-high2typeID=17912|
+mid1typeID=2303|
-high3name=Modulated Strip Miner II|
-high3typeID=17912|
-mid1name=Survey Scanner II|
-mid1typeID=2333|
-low1name=Mining Laser Upgrade II|
-low1typeID=28576|
-low2name=Mining Laser Upgrade II|
-low2typeID=28576|
-drone1name=Mining Drone II x5|
-drone1typeID=10250|
-drone2name=Warrior II x5|
-drone2typeID=2488|
-drone3name=open|
-drone4name=open|
-drone5name=open|
-charge1name=Veldspar Mining Crystal II x1|
-charge1typeID=18618|
-charge2name=Scordite Mining Crystal II x1|
-charge2typeID=18616|
-charge3name=Pyroxeres Mining Crystal II x1|
-charge3typeID=18614|
-charge4name=open|
-charge5name=open|
-rig1name=open|
-rig2name=open|
-rig3name=open|
-difficulty=2|
-warsop=A|
-warsopReason=|
-version=PRE-RET 1.0|
-shipDNA=17476:17912;3:2333;1:28576;2:2488;5:10250;5:18614;1:18616;1:18618;1::|
-skills=Mining Barge V</li><li>Astrogeology V</li><li>Electronics IV</li><li>Drones V</li><li>Combat Drone Operation III</li><li>Scout Drone Operation III</li><li>Hull Upgrades II</li><li>Mining Upgrades IV</li><li>Shield Upgrades I</li><li>Energy Management III</li><li>Energy Systems Operation III</li><li>Drone Durability III</li><li>Drone Interfacing III</li><li>Mining V</li><li>Refining IV</li><li>Plagioclase Processing IV|
-notes=This is a good point to train for T2 Strip Miners, which add a significant boost to your mining output but require more management and capacitor skills.</li><li>With no capacitor skills, you'll only just have enough capacitor to start all three strip miners at once, and only with hisec ore crystals. This can cause problems especially if you want to start mining just after coming out of warp, and training a couple of capacitor skills at this point is recommended.</li><li>The Cargohold Optimisation rigs of past fits are no longer beneficial to the Ore Hold (introduced in Inferno 1.2). Rig slots are now available for other purposes (e.g. Defence).}}
-}}<noinclude>
-{{Ship|Procurer|box}}
-Since the Inferno 1.2 patch, the Procurer has become a very respectable mining ship due to its combination of decent yield, good ore hold, great tank, and low cost. The Procurer's ore hold is larger than a covetor, smaller than a retriever, but can still fit several cycles worth of ore. The Procurer's base mining yield is the lowest of all the ORE ships, but has been improved significantly to be on par with other ORE mining ships. The procurer's tank is beat only by its T2 varient, the Skiff. Using inexpensive T1 modules, the procurer can reach 55K EHP, mine on par with a tanked retriever, and still be fit for less than the cost of a gank-fit Catalyst. The procurer is a great ship if you are looking to minimize your risk while still maintaining decent mining yield.
-</noinclude>{{#ifeq:{{{1|Procurer}}}|Procurer|
-{{ShipFitting|
-ship=Procurer|
-shipTypeID=17480|
-fitName=Hisec Mining|
-fitID=Hisec-Mining|
-high1name=Strip Miner I|
-high1typeID=17482|
-mid1name=Survey Scanner II|
-mid1typeID=2333|
 mid2name=Adaptive Invulnerability Field II|
 mid2typeID=2281|
 mid3name=Adaptive Invulnerability Field II|
 mid3typeID=2281|
-mid4name=EM Ward Field II|
+mid4name=Medium Shield Extender II|
-mid4typeID=2301|
+mid4typeID=3831|
-low1name=Mining Laser Upgrade II|
+low1name=Damage Control II|
-low1typeID=28576|
+low1typeID=2048|
 low2name=Mining Laser Upgrade II|
 low2typeID=28576|
-drone1name=Hornet EC-300 x5|
+drone1name=Mining Drone II x3|
-drone1typeID=23707|
+drone1typeID=10250|
-drone2name=open|
+drone2name=Hobgoblin II x2|
+drone2typeID=2456|
 drone3name=open|
 drone4name=open|
 drone5name=open|
-rig1name=Medium Anti-Thermal Screen Reinforcer I|
+rig1name=Medium Core Defense Field Extender I|
-rig1typeID=31754|
+rig1typeID=31790|
 rig2name=Medium Core Defense Field Extender I|
 rig2typeID=31790|
@@ Line 191: / Line 112: @@
 warsop=A|
 warsopReason=|
-version=ODY 1.0|
+version=RUB 1.0|
-shipDNA=17480:17482;1:2281;2:2301;1:2333;1:28576;2:31754;1:31790;2:23707;5::|
+shipDNA=17480:17912;1:2303;1:2281;2:3831;1:2048;1:28576;1:31790;3:2456;2:10250;3:18618;1::|
 skills=|
-notes=A high sec mining fit. </li><li>With all skills at V and before boosts, this ship has 57.8 K EHP, flies at 113 m/s and align in 9.4 s. The capacitor is stable.}}
+notes=This fit further increases the already-high EHP buffer of the fit above to a grand total of 97,696 EHP against Antimatter.</li><li>Note that this is done by removing the Survey Scanner module. As such, this fit is designed to work in small-scale mining fleets where a single ship uses a Survey Scanner to point out high-resource asteroids to the other miners.</li><li>Even at maximum skills, the Procurer is still a slow ship at 113 m/s. Use of a bounce bookmark that is on grid with the asteroid belt is recommended.}}
 {{ShipFitting|
 ship=Procurer|
@@ Line 236: / Line 156: @@
 }}<noinclude>
+=== Covetor ===
+The Covetor has the greatest mining yield out of the T1 mining barges, but has the smallest ore hold and the least tank. As a result, you need support from another pilot to be effective at your role, as you waste the time saved mining trying to haul the ore back to your drop off point.
+As Covetors are extremely easy to destroy in suicide gank attacks, using this ship without the possibility of storing it in an [[Orca]]'s Ship Maintenance Bay when attacked might be unwise.
+{{Ship|Covetor|box}}
+</noinclude>{{#ifeq:{{{1|Covetor}}}|Covetor|
+{{ShipFitting|
+ship=Covetor|
+shipTypeID=17476|
+fitName=Supported mining (T1)|
+fitID=Hisec-Mining|
+high1name=Strip Miner I|
+high1typeID=17482|
+high2name=Strip Miner I|
+high2typeID=17482|
+high3name=Strip Miner I|
+high3typeID=17482|
+mid1name=Survey Scanner I|
+mid1typeID=444|
+low1name=Mining Laser Upgrade I|
+low1typeID=22542|
+low2name=Mining Laser Upgrade I|
+low2typeID=22542|
+drone1name=Mining Drone I x5|
+drone1typeID=10246|
+drone2name=Warrior I x5|
+drone2typeID=2486|
+drone3name=open|
+drone4name=open|
+drone5name=open|
+rig1name=open|
+rig2name=open|
+rig3name=open|
+difficulty=0|
+warsop=A|
+warsopReason=|
+version=RUB 1.0|
+shipDNA=17476:17482;3:444;1:22542;2:2486;5:10246;5::|
+skills=Mining Barge V</li><li>Astrogeology V</li><li>Electronics IV</li><li>Drones V</li><li>Combat Drone Operation III</li><li>Drone Durability III</li><li>Drone Interfacing III</li><li>Hull Upgrades II</li><li>Mining Upgrades IV</li><li>Shield Upgrades I</li><li>Scout Drone Operation III</li><li>Drones III|
+notes=Due to the extreme ease of suicide ganking Covetors, this ship should only be used while in range of an Orca in order to use the Ship Maintenance Bay for protection.</li>The Cargohold Optimisation rigs of past fits are no longer beneficial to the Ore Hold (introduced in Inferno 1.2). Rig slots are now available for other purposes.}} {{ShipFitting|
+ship=Covetor|
+shipTypeID=17476|
+fitName=Supported mining (T2)|
+fitID=T2-Strips|
+high1name=Modulated Strip Miner II|
+high1typeID=17912|
+high2name=Modulated Strip Miner II|
+high2typeID=17912|
+high3name=Modulated Strip Miner II|
+high3typeID=17912|
+mid1name=Survey Scanner II|
+mid1typeID=2333|
+low1name=Mining Laser Upgrade II|
+low1typeID=28576|
+low2name=Mining Laser Upgrade II|
+low2typeID=28576|
+drone1name=Mining Drone II x5|
+drone1typeID=10250|
+drone2name=Warrior II x5|
+drone2typeID=2488|
+drone3name=open|
+drone4name=open|
+drone5name=open|
+charge1name=Veldspar Mining Crystal II x1|
+charge1typeID=18618|
+charge2name=Scordite Mining Crystal II x1|
+charge2typeID=18616|
+charge3name=Pyroxeres Mining Crystal II x1|
+charge3typeID=18614|
+charge4name=open|
+charge5name=open|
+rig1name=open|
+rig2name=open|
+rig3name=open|
+difficulty=2|
+warsop=A|
+warsopReason=|
+version=RUB 1.0|
+shipDNA=17476:17912;3:2333;1:28576;2:2488;5:10250;5:18614;1:18616;1:18618;1::|
+skills=Mining Barge V</li><li>Astrogeology V</li><li>CPU Management IV</li><li>Drones V</li><li>Combat Drone Operation III</li><li>Scout Drone Operation III</li><li>Hull Upgrades II</li><li>Mining Upgrades IV</li><li>Shield Upgrades I</li><li>Energy Management III</li><li>Energy Systems Operation III</li><li>Drone Durability III</li><li>Drone Interfacing III</li><li>Mining V</li><li>Refining IV</li><li>Plagioclase Processing IV|
+notes=Due to the extreme ease of suicide ganking Covetors, this ship should only be used while in range of an Orca in order to use the Ship Maintenance Bay for protection.</li><li>This is a good point to train for T2 Strip Miners, which add a significant boost to your mining output but require more management and capacitor skills.</li><li>With no capacitor skills, you'll only just have enough capacitor to start all three strip miners at once, and only with hisec ore crystals. This can cause problems especially if you want to start mining just after coming out of warp, and training a couple of capacitor skills at this point is recommended.</li><li>The Cargohold Optimisation rigs of past fits are no longer beneficial to the Ore Hold (introduced in Inferno 1.2). Rig slots are now available for other purposes.}}
+}}<noinclude>
+=== Retriever ===
+The Retriever has the largest ore hold out of the T1 mining barges, but has a middling yield and only slightly more tank than the Covetor. If you are mining without support in higher-security areas (.7 and above), the Retriever is the ship of choice as its slightly lower yield is offset by vastly reducing the number of ore drop-off runs that need to be made.
 {{Ship|Retriever|box}}
-The Retriever has the largest ore hold out of the T1 mining barges, but has a middling tank and yield. Its the most effective ship if you have no support (and are not worried about being ganked), as the large hold reduces the time spend travelling between your drop off point and the belt, which more then makes up for the slight drop in yield compared to the coveter.
 </noinclude>{{#ifeq:{{{1|Retriever}}}|Retriever|
 {{ShipFitting|
 ship=Retriever|
 shipTypeID=17478|
-fitName=Hisec Mining|
+fitName=Unsupported mining (T1)|
-fitID=Hisec-Mining|
+fitID=MiningT1|
 high1name=Strip Miner I|
 high1typeID=17482|
@@ Line 270: / Line 283: @@
 warsop=A|
 warsopReason=|
-version=PRE-RET 1.0|
+version=RUB 1.0|
 shipDNA=17478:17482;2:444;1:22542;3:2486;5::|
 skills=Mining Barge III</li><li>Astrogeology IV</li><li>Electronics IV</li><li>Drones V</li><li>Combat Drone Operation III</li><li>Hull Upgrades II</li><li>Mining Upgrades I</li><li>Drone Durability III</li><li>Drone Interfacing III</li><li>Electronics Upgrades I</li><li>Scout Drone Operation III|
-notes=The Cargohold Optimisation rigs of past fits are no longer beneficial to the Ore Hold (introduced in Inferno 1.2). Rig slots are now available for other purposes (e.g. Defence).}}
+notes=The Cargohold Optimisation rigs of past fits are no longer beneficial to the Ore Hold (introduced in Inferno 1.2). Rig slots are now available for other purposes.}}
-}}<noinclude>
+}} {{ShipFitting|
+ship=Retriever|
+shipTypeID=17478|
+fitName=Unsupported mining (T2)|
+fitID=MiningT2|
+high1name=Modulated Strip Miner II|
+high1typeID=17912|
+high2name=Modulated Strip Miner II|
+high2typeID=17912|
+mid1name=Survey Scanner II|
+mid1typeID=2333|
+low1name=Mining Laser Upgrade II|
+low1typeID=28576|
+low2name=Mining Laser Upgrade II|
+low2typeID=28576|
+low3name=Mining Laser Upgrade II|
+low3typeID=28576|
+drone1name=Hobgoblin II x2|
+drone1typeID=2456|
+drone2name=Mining Drone II x3|
+drone2typeID=10250|
+drone3name=open|
+drone4name=open|
+drone5name=open|
+rig1name=Medium Processor Overclocking Unit|
+rig1typeID=4395|
+rig2name=open|
+rig3name=open|
+difficulty=0|
+warsop=A|
+warsopReason=|
+version=RUB 1.0|
+shipDNA=17478:17912;2:2333;1:28576;3:4395;1:10250;3:2456;2:18618;2::|
+skills=Mining Barge III</li><li>Astrogeology IV</li><li>Electronics IV</li><li>Drones V</li><li>Combat Drone Operation III</li><li>Hull Upgrades II</li><li>Mining Upgrades IV</li><li>Drone Durability III</li><li>Drone Interfacing III</li><li>Electronics Upgrades I</li><li>Scout Drone Operation V|
+notes=The Medium Processor Overclocking Unit I rig may not be necessary if your fitting skills are good.</li><li>The Cargohold Optimisation rigs of past fits are no longer beneficial to the Ore Hold (introduced in Inferno 1.2). Rig slots are now available for other purposes.}}<noinclude>
 ==Exhumer==