<feed xmlns='http://www.w3.org/2005/Atom'>
<title>technic/unified_inventory, branch origin/stable</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<id>http://git.linux-forks.de/technic/atom?h=origin%2Fstable</id>
<link rel='self' href='http://git.linux-forks.de/technic/atom?h=origin%2Fstable'/>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/'/>
<updated>2013-07-08T20:57:56+00:00</updated>
<entry>
<title>Merge branch 'indev'</title>
<updated>2013-07-08T20:57:56+00:00</updated>
<author>
<name>ShadowNinja</name>
<email>noreply@gmail.com</email>
</author>
<published>2013-07-08T20:53:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=19c9a0443b17176a27329b69ee16fe28d7be6fd8'/>
<id>urn:sha1:19c9a0443b17176a27329b69ee16fe28d7be6fd8</id>
<content type='text'>
Conflicts:
	technic/alloy_furnace.lua
	technic/alloy_furnaces_commons.lua
	technic/battery_box.lua
	technic/battery_box_hv.lua
	technic/battery_box_mv.lua
	technic/chainsaw.lua
	technic/cnc.lua
	technic/cnc_nodes.lua
	technic/electric_furnace.lua
	technic/grinder.lua
	technic/init.lua
	technic/solar_array_hv.lua
	technic/solar_array_lv.lua
	technic/solar_array_mv.lua
	technic/solar_panel.lua
	unified_inventory/api.lua
	unified_inventory/depends.txt
</content>
</entry>
<entry>
<title>Merge changes made in technic_game</title>
<updated>2013-07-06T08:35:48+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-07-06T08:35:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=3a3700537baa748e459258385d27bb79ab391546'/>
<id>urn:sha1:3a3700537baa748e459258385d27bb79ab391546</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Add extractor.</title>
<updated>2013-07-04T17:05:00+00:00</updated>
<author>
<name>m97</name>
<email>pitekmarcin22@gmail.com</email>
</author>
<published>2013-07-04T17:05:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=ce5dfa311ebc1347e11721c21a83b808a5bbccbd'/>
<id>urn:sha1:ce5dfa311ebc1347e11721c21a83b808a5bbccbd</id>
<content type='text'>
Add extractor for make more rubber from latex. Moved make dyes from
grinder to extractor.
</content>
</entry>
<entry>
<title>Fix to formspec background element syntax</title>
<updated>2013-07-03T21:32:41+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-07-03T21:32:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=66a4a91224242ae5fb2a20c1e4647fdea2531c16'/>
<id>urn:sha1:66a4a91224242ae5fb2a20c1e4647fdea2531c16</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Sync with indev branch, bump version to 0.4.7</title>
<updated>2013-06-30T05:12:02+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-06-30T05:12:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=8e03d7ded6441b26e9d44102c0cd2ee39f9e90bc'/>
<id>urn:sha1:8e03d7ded6441b26e9d44102c0cd2ee39f9e90bc</id>
<content type='text'>
</content>
</entry>
<entry>
<title>bugfix</title>
<updated>2013-05-25T20:39:25+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-05-25T20:39:25+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=630db84ad13682eadc0035c251febfa07353a969'/>
<id>urn:sha1:630db84ad13682eadc0035c251febfa07353a969</id>
<content type='text'>
</content>
</entry>
<entry>
<title>removed aaa_recipeshook from depends.txt as it is not used anymore.</title>
<updated>2013-04-15T06:49:22+00:00</updated>
<author>
<name>Vanessa Ezekowitz</name>
<email>vanessaezekowitz@gmail.com</email>
</author>
<published>2013-04-15T06:49:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=a9f73e53d909f7a89539cc90cddf195a15004b2f'/>
<id>urn:sha1:a9f73e53d909f7a89539cc90cddf195a15004b2f</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update crafting guide</title>
<updated>2013-04-15T06:28:17+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-04-15T06:28:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=642b8bec16ef56a6be1a5abbffb50f479b0fdb1b'/>
<id>urn:sha1:642b8bec16ef56a6be1a5abbffb50f479b0fdb1b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>remove aaa_recipeshook from unified inventory depends (it isn't needed anymore)</title>
<updated>2013-04-14T07:40:34+00:00</updated>
<author>
<name>Vanessa Ezekowitz</name>
<email>vanessaezekowitz@gmail.com</email>
</author>
<published>2013-04-14T07:40:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=17fbd2c3353424a5dfdba1b4d92b0a9a2fce4356'/>
<id>urn:sha1:17fbd2c3353424a5dfdba1b4d92b0a9a2fce4356</id>
<content type='text'>
</content>
</entry>
<entry>
<title>changes to CraftingGuide</title>
<updated>2013-04-14T04:12:49+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-04-14T04:12:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=69ae366f6084bcda08d74abb4d3577a42f27a93b'/>
<id>urn:sha1:69ae366f6084bcda08d74abb4d3577a42f27a93b</id>
<content type='text'>
</content>
</entry>
</feed>
