| 
						
					 | 
					
						
						
							
						
						34fa8a1167
					 | 
					
						
						
							
							now the insulated wires change their color when they are turn on
						
						
						
						
						
						
					 | 
					
						2012-12-21 20:24:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						23bebfc054
					 | 
					
						
						
							
							Merge branch 'master' into nextgen
						
						
						
						
						
						
						
						Conflicts:
	mesecons/internal.lua
	mesecons/wires.lua
	mesecons_pistons/init.lua 
						
						
					 | 
					
						2012-12-21 16:22:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						13befe3bba
					 | 
					
						
						
							
							Fix #62 (Hopefully this time)
						
						
						
						
						
						
					 | 
					
						2012-12-16 19:03:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						0aab812487
					 | 
					
						
						
							
							Fix addPosRule without mesecon: in vertical wires (issue #62)
						
						
						
						
						
						
					 | 
					
						2012-12-16 13:02:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						ae4bd1e21c
					 | 
					
						
						
							
							Merge branch 'master' into nextgen
						
						
						
						
						
						
						
						Conflicts:
	mesecons_pistons/init.lua 
						
						
					 | 
					
						2012-12-16 08:59:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anthony Zhang
							
						 
					 | 
					
						
						
							
						
						b5f5beeb3d
					 | 
					
						
						
							
							Attempt to update the wire crossing.
						
						
						
						
						
						
					 | 
					
						2012-12-15 17:53:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						44dc1a128c
					 | 
					
						
						
							
							Upload cleaned up mesecons to nextgen branch
						
						
						
						
						
						
					 | 
					
						2012-12-15 18:45:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						c0d3bd2abb
					 | 
					
						
						
							
							Include experimental vertical wires (needs textures)
						
						
						
						
						
						
					 | 
					
						2012-12-13 18:42:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						cf6080f723
					 | 
					
						
						
							
							Port more blocks to nodedef system: object detector, extrawires, water turbine, insulated wire
						
						
						
						
						
						
					 | 
					
						2012-12-08 22:28:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kyle
							
						 
					 | 
					
						
						
							
						
						cee2574ff2
					 | 
					
						
						
							
							fix t-junction selectionbox when on
						
						
						
						
						
						
					 | 
					
						2012-09-10 15:48:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeija
							
						 
					 | 
					
						
						
							
						
						e92387695d
					 | 
					
						
						
							
							Add T-junction extrawire (no good textures yet)
						
						
						
						
						
						
					 | 
					
						2012-09-09 13:34:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kyle
							
						 
					 | 
					
						
						
							
						
						d3b1c43ee1
					 | 
					
						
						
							
							crossing wire moved into mesecons
						
						
						
						
						
						
					 | 
					
						2012-09-07 13:18:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |