<feed xmlns='http://www.w3.org/2005/Atom'>
<title>technic, 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-12T19:07:02+00:00</updated>
<entry>
<title>Fix forcefield</title>
<updated>2013-07-12T19:07:02+00:00</updated>
<author>
<name>ShadowNinja</name>
<email>noreply@gmail.com</email>
</author>
<published>2013-07-12T19:06:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=30361afb347ff1a548833e58b1731937584c6e7d'/>
<id>urn:sha1:30361afb347ff1a548833e58b1731937584c6e7d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Remove file that doesn't seem to have any use.</title>
<updated>2013-07-11T21:01:13+00:00</updated>
<author>
<name>kpoppel</name>
<email>poulsen.kim@gmail.com</email>
</author>
<published>2013-07-11T21:01:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=fa846989aca2f48a7b3553673f4570ec1ebcf388'/>
<id>urn:sha1:fa846989aca2f48a7b3553673f4570ec1ebcf388</id>
<content type='text'>
Fix typing error in register... file
Fix two issues with nuclear reactor and set the burn time to 24h.
</content>
</entry>
<entry>
<title>Load tools</title>
<updated>2013-07-11T19:11:28+00:00</updated>
<author>
<name>ShadowNinja</name>
<email>noreply@gmail.com</email>
</author>
<published>2013-07-11T19:10:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=d497429abcbf14c89c1bdaf0021ab59473f9c808'/>
<id>urn:sha1:d497429abcbf14c89c1bdaf0021ab59473f9c808</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Move files to subfolders</title>
<updated>2013-07-11T16:31:00+00:00</updated>
<author>
<name>ShadowNinja</name>
<email>noreply@gmail.com</email>
</author>
<published>2013-07-11T16:19:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=5d470cd753efe8f4640099165a7bfc0c6e181c35'/>
<id>urn:sha1:5d470cd753efe8f4640099165a7bfc0c6e181c35</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update nuclear_reactor_hv.lua</title>
<updated>2013-07-11T12:33:03+00:00</updated>
<author>
<name>kpoppel</name>
<email>poulsen.kim@gmail.com</email>
</author>
<published>2013-07-11T12:33:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=afc84d6a8da150b822b54fe9edffdfb7403a276b'/>
<id>urn:sha1:afc84d6a8da150b822b54fe9edffdfb7403a276b</id>
<content type='text'>
Fix temporary recipe.</content>
</entry>
<entry>
<title>Add nuclear reactor</title>
<updated>2013-07-11T01:45:56+00:00</updated>
<author>
<name>kpoppel</name>
<email>poulsen.kim@gmail.com</email>
</author>
<published>2013-07-10T23:04:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=3055270a7cda08b3ebc9cc38bcd871fb1dd12264'/>
<id>urn:sha1:3055270a7cda08b3ebc9cc38bcd871fb1dd12264</id>
<content type='text'>
Still needs some work. I am pushing it to get ideas and feedback.
Also fix some bugs in the LV coal generator that were found while making
the nuclear reactor.

Conflicts:
	technic/init.lua
</content>
</entry>
<entry>
<title>Fix HV battery box and some indentation.</title>
<updated>2013-07-08T21:05:34+00:00</updated>
<author>
<name>kpoppel</name>
<email>poulsen.kim@gmail.com</email>
</author>
<published>2013-07-08T20:11:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=13e8857f1a6cc313847aaf330b7ad6ef5db8a901'/>
<id>urn:sha1:13e8857f1a6cc313847aaf330b7ad6ef5db8a901</id>
<content type='text'>
Bug found by pagliaccio.
</content>
</entry>
<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 pull request #43 from ObKo/indev-enriched-uranium</title>
<updated>2013-07-06T22:55:26+00:00</updated>
<author>
<name>kpoppel</name>
<email>poulsen.kim@gmail.com</email>
</author>
<published>2013-07-06T22:55:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=79e8d26989cf20108bc69cf3b1da32655d57735a'/>
<id>urn:sha1:79e8d26989cf20108bc69cf3b1da32655d57735a</id>
<content type='text'>
Enriched Uranium.</content>
</entry>
<entry>
<title>Enriched Uranium.</title>
<updated>2013-07-06T13:52:41+00:00</updated>
<author>
<name>Konstantin Oblaukhov</name>
<email>oblaukhov.konstantin@gmail.com</email>
</author>
<published>2013-07-06T13:52:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.linux-forks.de/technic/commit/?id=8be389e774a99ec5d08ca86b3902bb98310fd58d'/>
<id>urn:sha1:8be389e774a99ec5d08ca86b3902bb98310fd58d</id>
<content type='text'>
</content>
</entry>
</feed>
