Merge branch 'master' into dev

config/txloader/load/betterquesting/lang/template.lang

@@ -3370,10 +3370,6 @@ betterquesting.quest.AAAAAAAAAAAAAAAAAAAKMQ.desc=If you want some of this highly
 betterquesting.quest.AAAAAAAAAAAAAAAAAAAKVQ.name=§c§lFusion Rocketry
 betterquesting.quest.AAAAAAAAAAAAAAAAAAAKVQ.desc=So you completed your Fusion Reactor and made your rocket, great! Now time to get some new ore! (like that isn't getting old) You don't need your hand held anymore, so I'll just list what's new.%n%nEnceladus, Miranda, Oberon, Ross128ba and Titan are the new planets. Miranda is the 1st moon of Uranus, while Oberon is the last. Enceladus is the 2nd moon of Saturn, while Titan is the second last. Ross128ba is Ross128b's moon in the Ross128 System to the South.%n%nThe new veins are Nickel, Tungsten, and Vanadium. The ores are: Chrome, Deep Iron, Iridium, Gold, Magnetite, Nickel, Osmium, Silicon, Shadowiron, Tungsten, and Vanadium.%n%nYou can get Neutronium from small ores on Enceladus, Oberon, and Titan.%n%nAnd grab some planet blocks while you're at it too.%n%nYou can get the schematic for T6 on Enceladus.%n%n[note]I'm sure you can tell by now, but it's not like every planet is required, so go to the ones you want to, and skip the ones you don't want to go to. Use NEI to figure out where you NEED to go.[/note]
 
-# Quest: Magneto Resonatic Circuits
-betterquesting.quest.AAAAAAAAAAAAAAAAAAAKag.name=§c§lMagneto Resonatic Circuits
-betterquesting.quest.AAAAAAAAAAAAAAAAAAAKag.desc=So, you may have been looking through NEI and seen a line of purple circuits from BW and wondered 'What are these, and when can I make them?'. Well, I don't know why they exist, but you can make them starting now!%n%nThey all use Imprint Supporting Boards, a type of crystal (change the dust to crystal with Neon or Krypton in an Autoclave, and then move up tiers with the Precision Laser Engraver), SMDs (or an advanced version), and [note]a circuit of the previous tier.[/note] So the material cost increases rather dramatically. They're made at a power tier +1 of the circuit's tier, so IV ones are made with LuV voltage.%n%nYou can even make UEV circuits if you're crazy enough!
-
 # Quest: No, It Won't Repair Your Car
 betterquesting.quest.AAAAAAAAAAAAAAAAAAAKdQ.name=§c§lNo, It Won't Repair Your Car
 betterquesting.quest.AAAAAAAAAAAAAAAAAAAKdQ.desc=The Auto Maintenance Hatch will correct maintenance problems immediately at the cost of some materials. Invaluable if you want to make sure your cleanroom machines won't void stuff. Or you could just use a howler and do it yourself I guess.