Zefram
							
						 
					 | 
					
						
						
							
						
						0294fc8f3a
					 | 
					
						
						
							
							various backward-compatibility aliases
						
						
						
						
						
						
					 | 
					
						2014-04-30 00:26:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xanthin
							
						 
					 | 
					
						
						
							
						
						39c41a06f4
					 | 
					
						
						
							
							Add german translations for all mods
						
						
						
						
						
						
					 | 
					
						2014-04-22 16:30:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShadowNinja
							
						 
					 | 
					
						
						
							
						
						64db3d14d8
					 | 
					
						
						
							
							Remove duplicate ABM
						
						
						
						
						
						
					 | 
					
						2013-12-17 14:24:06 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShadowNinja
							
						 
					 | 
					
						
						
							
						
						163457ed9a
					 | 
					
						
						
							
							Drop full rubber tree nodes
						
						
						
						
						
						
					 | 
					
						2013-11-27 17:24:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShadowNinja
							
						 
					 | 
					
						
						
							
						
						05b28f553e
					 | 
					
						
						
							
							Don't regenerate placed rubber tree trunks
						
						
						
						
						
						
					 | 
					
						2013-11-27 17:14:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novatux
							
						 
					 | 
					
						
						
							
						
						d8e02eb2dd
					 | 
					
						
						
							
							Add mg support
						
						
						
						
						
						
					 | 
					
						2013-10-29 11:18:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novatux
							
						 
					 | 
					
						
						
							
						
						76879424ae
					 | 
					
						
						
							
							Add crafts for frames and templates.
						
						
						
						
						
						
					 | 
					
						2013-10-26 09:13:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShadowNinja
							
						 
					 | 
					
						
						
							
						
						ee0765804c
					 | 
					
						
						
							
							Partial rewrite
						
						
						
						
						
						
					 | 
					
						2013-09-17 16:37:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShadowNinja
							
						 
					 | 
					
						
						
							
						
						19c9a0443b
					 | 
					
						
						
							
							Merge branch 'indev'
						
						
						
						
						
						
						
						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 
						
						
					 | 
					
						2013-07-08 16:57:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RealBadAngel
							
						 
					 | 
					
						
						
							
						
						3a3700537b
					 | 
					
						
						
							
							Merge changes made in technic_game
						
						
						
						
						
						
					 | 
					
						2013-07-06 10:35:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Konstantin Oblaukhov
							
						 
					 | 
					
						
						
							
						
						b78b90d422
					 | 
					
						
						
							
							New textures for lumps and ingots.
						
						
						
						
						
						
					 | 
					
						2013-07-05 02:28:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vanessa Ezekowitz
							
						 
					 | 
					
						
						
							
						
						465890950b
					 | 
					
						
						
							
							Improved cross-compatibility with homedecor's brass ingots.
						
						
						
						
						
						
					 | 
					
						2013-07-04 23:33:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Konstantin Oblaukhov
							
						 
					 | 
					
						
						
							
						
						9de141ee6b
					 | 
					
						
						
							
							New blocks of metal.
						
						
						
						
						
						
					 | 
					
						2013-06-27 09:13:44 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShadowNinja
							
						 
					 | 
					
						
						
							
						
						00328622d9
					 | 
					
						
						
							
							Store configuration in the world directory.
						
						
						
						
						
						
					 | 
					
						2013-04-27 13:53:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vanessa Ezekowitz
							
						 
					 | 
					
						
						
							
						
						106e1816dc
					 | 
					
						
						
							
							deleted undesired backup file
						
						
						
						
						
						
					 | 
					
						2013-04-14 22:53:30 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vanessa Ezekowitz
							
						 
					 | 
					
						
						
							
						
						05131f8b07
					 | 
					
						
						
							
							aliased diamong block back to default one.
						
						
						
						
						
						
					 | 
					
						2013-04-14 22:24:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RealBadAngel
							
						 
					 | 
					
						
						
							
						
						83d4cdb630
					 | 
					
						
						
							
							Update 0.4.6-0
						
						
						
						
						
						
					 | 
					
						2013-04-04 01:19:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RealBadAngel
							
						 
					 | 
					
						
						
							
						
						0ca19dacb0
					 | 
					
						
						
							
							Update 0.4.6-0
						
						
						
						
						
						
					 | 
					
						2013-04-04 01:17:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RealBadAngel
							
						 
					 | 
					
						
						
							
						
						1668d84b04
					 | 
					
						
						
							
							add missing dep file
						
						
						
						
						
						
					 | 
					
						2013-03-31 19:36:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RealBadAngel
							
						 
					 | 
					
						
						
							
						
						fad68d10e0
					 | 
					
						
						
							
							textures moved from main mod to worldgen
						
						
						
						
						
						
					 | 
					
						2013-03-30 20:18:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RealBadAngel
							
						 
					 | 
					
						
						
							
						
						279776ff62
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2013-03-30 11:36:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |