Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10

# Conflicts:
#	changelog.md

build.properties

@@ -2,7 +2,7 @@ minecraft.version=1.10.2
 minecraft.mappings=snapshot_20160720
 forge.version=12.18.3.2221
 
-oc.version=1.7.1
+oc.version=1.7.2
 
 ae2.version=rv4-alpha-11
 bc.version=7.0.9

changelog.md

@@ -1,40 +1,55 @@
 ## New Features/Support
-* **Changed: Diamond Chip recipe**
+* Added: Tier 1 Wireless Network Card (TheCodex6824)
-  - You now require cutting wire to cut the diamond.
+  - Can only have one open port at a time
-* Added: ExtraCells and Mekanism integration (DrummerMC) [1.10.2]
+  - Has a signal strength of 16 blocks
-* Fixed: IC2-Classic mod incompatibility 
+  - The already existing wireless network card is now the Tier 2 card, has not been changed in any other way.
-* Added: Allow getting yaw of player through tablet component (ChristoCoder)
+* **Added: Sheep Power** (and ocelot power)
-* Fixed: Microcontroller interactions with EnderIO item conduits
+  - **Carpeted Capacitors** exist now. They work and connect just like normal capacitors and form blocks with them.
-* Added: Maximum packet parts to device info of modems (Linked and Network Cards)
+  - Carpeted Capacitors generate power when sheep or ocelots walk on them.
-* Fixed: Drones now properly work with chunkloader upgrades (TheCodex6824)
+  - Power is generated when at least 2 of a type of animal are present. A single sheep and a single ocelot generate no power.
-* Fixed: Tablets not turning off their screen properly (AmandaCameron)
+  - Ocelots are notorious for their tendency to summon electrostatic fields from the feline dimension. They generate more power than sheep do.
-* Fixed: Motion Sensor line of sight
+  - Yes, this means you can now use OC without any energy-producing mod again without having to change the config. 
-* Misc: Updated various translations
+  - Insert interesting reference mentioning electric sheep here
-  - Russian (S0ZDATEL, Fingercomp, makkarpov)
+* Added: Creative Component Bus (Xyxen)
-  - Traditional Chinese (mymagadsl)
+  - Allows servers to support up to 1024 components
-  - German (Nex4rius)
+* **Changed: Lua 5.3 is now the default architecture for newly crafted CPUs**
+  - CPUs that were crafted prior to this update will continue running whichever architecture they were set to, or Lua 5.2
+* Added: You can now change the name of a robot using another computer.
+  - Added `setName` and `getName` to robots.
+  - Computers connected to the robot can access the robot as a component to call these functions.
+  - The Robot must be shut down for this to work
+* Fixed: Certain characters and glyph width in screen rendering
+* Fixed: Blocks with inventories failing to save under certain circumstances
+* Fixed: Drones with chunkloader upgrades not always properly loading chunks (TheCodex6824)
+* Fixed: AppliedEnergistics 2 integration
+  - Certain filters for `getItemsInNetwork()` not working
+  - `getCpus()` not returning the correct number
+  - `exportIntoSlot()` not working
+  - Added `isCraftable` to gathered item data
+* Fixed: `computer.addUser` not erroring properly
+* Fixed: Made cable collision box closer to cable shape (SquidDev)
+* Fixed: Crafting Upgrade not always crafting what it should be crafting
+* Fixed: Crafting Upgrade making items uncraftable
+* Fixed: Motion Sensor still not working properly
+* Fixed: Robots interacting with items that directly modify their inventory (like IC2 fluid cells)
+* Fixed: Potential memory leak in networking code
+* Fixed: `getMetadata` on the Debug Card on Minecraft 1.10 and above (BrisingrAerowing)
+* Added: `getBlockState` for the Debug Card  on Minecraft 1.10 and above (BrisingrAerowing)
+* Fixed: Crafting a robot or drone with an EEPROM not working on Minecraft 1.10 and above
+* Fixed: `getAllStacks()` on the Inventory Controller Upgrade and Transposer has been backported to Minecraft 1.7.10.
+
+* Misc: Updated French translation (Naheulf)
 
 ## OpenOS fixes/improvements
-* Fixed: Issues with booting OpenOS on very slow servers
+* Fixed: install.lua now should work more like one would expect
-* Added: Allow custom error objects to print to stderr
+* Changed: uuid.lua is now generating valid RFC4122 version 4 UUIDs (jobe1986)
-* Added: Allow mount points to use existing directories
+* Fixed: Various fixes to vt100 support
-* Added: Bind mounts to mount a directory as another directory
+* Fixed: Memory leak in process loading
-* Fixed: Allow .shrc to use tty stdin
+* Fixed: Made modifier keypresses more specific in /bin/edit
-* **Added: Lua REPL input is now parsed with an implicit `return`** (SquidDev)
-  - Adding a `=` in front of the code to explicitly add it still works.
-* Changed: Shell history no longer adds items if they are duplicates (SquidDev)
-* Fixed: CTCP messages in IRC client (Michiyo, skyem123)
-* Fixed: Reverse lookup of keys in Keyboard API
-* Fixed: event.cancel and event.ignore
-* Fixed: Protect lua shell from serialization OOM failure
-* Fixed: Too long without yielding error in /bin/tree (LeshaInc)
-* Misc: Improvements to the vt100 library
-* Misc: Various minor improvements to reduce memory usage
 
 ## List of contributors
 payonel, Vexatos,  
-S0ZDATEL, Fingercomp, makkarpov,  
+Xyxen, TheCodex6824, SquidDev,  
-mymagadsl, Nex4rius, ChristoCoder,  
+BrisingrAerowing, jobe1986,  
-DrummerMC, LeshaInc, SquidDev, Michiyo,  
+Naheulf, SDPhantom,  
-josephcsible, skyem123, TheCodex6824,  
+Zerotiger, anar4732
-AmandaCameron, Pwootage

src/main/resources/assets/opencomputers/loot/openos/lib/core/boot.lua

@@ -1,7 +1,7 @@
 -- called from /init.lua
 local raw_loadfile = ...
 
-_G._OSVERSION = "OpenOS 1.7.1"
+_G._OSVERSION = "OpenOS 1.7.2"
 
 local component = component
 local computer = computer