From bdd13beeff5045a34042439e39620b9ca550b214 Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Tue, 27 Nov 2018 21:24:52 +0100
Subject: [PATCH] fix brass block->ingot recipe (clearing basic_materials' copper/silver recipe killed this one also)

---
 technic/locale/template.txt |   71 +++++++++++++----------------------
 1 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/technic/locale/template.txt b/technic/locale/template.txt
index d771c09..f94ccda 100644
--- a/technic/locale/template.txt
+++ b/technic/locale/template.txt
@@ -29,11 +29,14 @@
 Carbon Cloth =
 Raw Latex =
 Rubber Fiber =
+%.1f%%-Fissile Uranium Ingot =
+%.1f%%-Fissile Uranium Block =
 
 ## Machine misc
 Machine cannot be removed because it is not empty =
 Inventory move disallowed due to protection =
 # $1: Machine name (Includes tier)
+@1 Active (@2 EU) =
 %s Active =
 %s Disabled =
 %s Enabled =
@@ -52,19 +55,23 @@
 In: =
 Out: =
 Slot %d =
-Mode: %s =
-single items =
-whole stacks =
+Itemwise =
+Stackwise =
 Ignoring Mesecon Signal =
-Controlled by Positive Mesecon Signal =
-Controlled by Inverted Mesecon Signal =
+Controlled by Mesecon Signal =
+Owner: =
+Unlocked =
+Locked =
+Radius: =
+Enabled =
+Disabled =
 
 ## Machine names
 # $1: Tier
 %s Alloy Furnace =
-%s Battery Box = 
+%s Battery Box =
 %s Cable =
-%s CNC Machine =
+%s Centrifuge =
 %s Compressor =
 %s Extractor =
 %s Forcefield Emitter =
@@ -80,7 +87,7 @@
 Nuclear %s Generator Core =
 Small Solar %s Generator =
 Wind %s Generator =
-Injector =
+Self-Contained Injector =
 Constructor Mk%d =
 Frame =
 Frame Motor =
@@ -96,6 +103,7 @@
 Wind Mill Frame =
 Forcefield =
 Nuclear Reactor Rod Compartment =
+Administrative World Anchor =
 
 ## Machine-specific
 # $1: Pruduced EU
@@ -103,48 +111,21 @@
 Discharge =
 Power level =
 # $1: Tier $2: current_charge $3: max_charge 
-%s Battery Box: %d/%d =
+@1 Battery Box: @2/@3 =
 # $1: Machine name $2: Supply $3: Demand
-%s. Supply: %d Demand: %d =
+@1. Supply: @2 Demand: @3 =
 Production at %d%% =
 Choose Milling Program: =
 Slim Elements half / normal height: =
 Current track %s =
+Stopped =
+Keeping %d/%d map blocks loaded =
+Digging not started =
+Digging finished =
+Digging %d m above machine =
+Digging %d m below machine =
+@1 (@2 @3 -> @4 @5) =
 
-## CNC
-Cylinder =
-Element Cross =
-Element Cross Double =
-Element Edge =
-Element Edge Double =
-Element End =
-Element End Double =
-Element Straight =
-Element Straight Double =
-Element T =
-Element T Double =
-Horizontal Cylinder =
-One Curved Edge Block =
-Pyramid =
-Slope =
-Slope Edge =
-Slope Inner Edge =
-Slope Lying =
-Slope Upside Down =
-Slope Upside Down Edge =
-Slope Upside Down Inner Edge =
-Sphere =
-Spike =
-Stick =
-Two Curved Edge Block =
-Brick =
-Cobble =
-Dirt =
-Leaves =
-Sandstone =
-Stone =
-Tree =
-Wooden =
 
 ## Grinder Recipes
 # $1: Name
@@ -167,6 +148,7 @@
 Tin =
 Wrought Iron =
 Zinc =
+%.1f%%-Fissile Uranium =
 
 ## Tools
 RE Battery =
@@ -191,3 +173,4 @@
 Grinding =
 Compressing =
 Extracting =
+Separating =

--
Gitblit v1.8.0