<feed xmlns='http://www.w3.org/2005/Atom'>
<title>technic/technic_worldgen, 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>New textures for lumps and ingots.</title>
<updated>2013-07-05T06:28:22+00:00</updated>
<author>
<name>Konstantin Oblaukhov</name>
<email>oblaukhov.konstantin@gmail.com</email>
</author>
<published>2013-06-26T13:48:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=b78b90d4223e01a5c8611105b125e91855bbf602'/>
<id>urn:sha1:b78b90d4223e01a5c8611105b125e91855bbf602</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Improved cross-compatibility with homedecor's brass ingots.</title>
<updated>2013-07-05T03:33:04+00:00</updated>
<author>
<name>Vanessa Ezekowitz</name>
<email>vanessaezekowitz@gmail.com</email>
</author>
<published>2013-07-05T03:32:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=465890950b7b68225bdedf771f995281ba879d27'/>
<id>urn:sha1:465890950b7b68225bdedf771f995281ba879d27</id>
<content type='text'>
</content>
</entry>
<entry>
<title>New blocks of metal.</title>
<updated>2013-06-27T02:13:44+00:00</updated>
<author>
<name>Konstantin Oblaukhov</name>
<email>oblaukhov.konstantin@gmail.com</email>
</author>
<published>2013-06-27T02:13:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=9de141ee6b5a049e5f0bd53ecbd867e0c465ed77'/>
<id>urn:sha1:9de141ee6b5a049e5f0bd53ecbd867e0c465ed77</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Store configuration in the world directory.</title>
<updated>2013-04-27T17:53:12+00:00</updated>
<author>
<name>ShadowNinja</name>
<email>noreply@gmail.com</email>
</author>
<published>2013-04-26T01:39:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=00328622d9cc38a7768a7bf449f5c52ddba666f7'/>
<id>urn:sha1:00328622d9cc38a7768a7bf449f5c52ddba666f7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>deleted undesired backup file</title>
<updated>2013-04-15T02:53:30+00:00</updated>
<author>
<name>Vanessa Ezekowitz</name>
<email>vanessaezekowitz@gmail.com</email>
</author>
<published>2013-04-15T02:53:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=106e1816dcd3500b9fe730c16753ec379b92d77a'/>
<id>urn:sha1:106e1816dcd3500b9fe730c16753ec379b92d77a</id>
<content type='text'>
</content>
</entry>
<entry>
<title>aliased diamong block back to default one.</title>
<updated>2013-04-15T02:24:55+00:00</updated>
<author>
<name>Vanessa Ezekowitz</name>
<email>vanessaezekowitz@gmail.com</email>
</author>
<published>2013-04-15T02:24:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=05131f8b07bab8c8464d37de9d4d589de56ee118'/>
<id>urn:sha1:05131f8b07bab8c8464d37de9d4d589de56ee118</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update 0.4.6-0</title>
<updated>2013-04-03T23:19:57+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-04-03T23:19:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=83d4cdb6303a0e8d9d4843b145448fb3ebe0156b'/>
<id>urn:sha1:83d4cdb6303a0e8d9d4843b145448fb3ebe0156b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update 0.4.6-0</title>
<updated>2013-04-03T23:17:39+00:00</updated>
<author>
<name>RealBadAngel</name>
<email>mk@realbadangel.pl</email>
</author>
<published>2013-04-03T23:17:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=0ca19dacb03a0d33de34a2dabf921ba7c9cb5b25'/>
<id>urn:sha1:0ca19dacb03a0d33de34a2dabf921ba7c9cb5b25</id>
<content type='text'>
</content>
</entry>
</feed>
