Fix language file

ReadMe.md

@@ -21,7 +21,6 @@ Miscellaneous changes for ComputerCraft
  - Blacklist turtle verbs - no more `turtle.inspect` if you don't like it.
  - Turtle refuel using RF/EU
  - Turtle tool host - use any tool with turtles
- - Turtles named dinnerbone or Grumm turn upside down
 
 ### Networking
  - Networking API: add custom network components
@@ -35,6 +34,7 @@ Miscellaneous changes for ComputerCraft
  - Computer upgrades - convert normal computers to advanced!
  - Debug Wand - add the debug API to any computer
  - Monitors emit light
+ - Pocket computer upgrades
 
 ## Contributing
 ### Code and dependencies:

gradle.properties

@@ -1,7 +1,7 @@
 # Mod stuff
 mc_version=1.8.9
 forge_version=11.15.1.1722
-mod_version=0.3.1
+mod_version=0.3.2
 
 # Various libraries
 cc_version=1.78

src/main/resources/assets/cctweaks/lang/en_US.lang

@@ -33,22 +33,16 @@ gui.config.cctweaks.computer.computerThreadTimeout=Computer Thread Timeout
 gui.config.cctweaks.computer.luaJC=LuaJC
 gui.config.cctweaks.computer.luaJCVerify=Verify LuaJC
 gui.config.cctweaks.computer.cobalt=Cobalt VM
+gui.config.cctweaks.computer.timeoutError=Timeout Error
 
 gui.config.cctweaks.turtle=Turtle
 gui.config.cctweaks.turtle.fluxRefuelAmount=RF Refuel Amount
 gui.config.cctweaks.turtle.euRefuelAmount=EU Refuel Amount
 gui.config.cctweaks.turtle.disabledActions=Disabled Actions
-<<<<<<< HEAD
-=======
-gui.config.cctweaks.turtle.funNames=Fun names
->>>>>>> minecraft-1.7.10
 
 gui.config.cctweaks.turtle.toolhost=Tool Host
 gui.config.cctweaks.turtle.toolhost.enabled=Enabled
-<<<<<<< HEAD
-=======
 gui.config.cctweaks.turtle.toolhost.advanced=Enabled Advanced
->>>>>>> minecraft-1.7.10
 gui.config.cctweaks.turtle.toolhost.crafting=Enable Crafting
 gui.config.cctweaks.turtle.toolhost.upgradeId=Upgrade ID
 gui.config.cctweaks.turtle.toolhost.advancedUpgradeId=Advanced Upgrade ID