Fabian Dill
							
						 
					 | 
					
						
						
							
						
						3d93f659e3
					 | 
					
						
						
							
							some option updates
						
						
						
						
						
						
					 | 
					
						2021-03-14 08:38:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						3d81f0cca7
					 | 
					
						
						
							
							update after merge from /main
						
						
						
						
						
						
					 | 
					
						2021-01-30 23:43:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						a646594f08
					 | 
					
						
						
							
							Merge branch 'main' into breaking_changes
						
						
						
						
						
						
						
						# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py 
						
						
					 | 
					
						2021-01-30 23:29:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						f3e686ba9a
					 | 
					
						
						
							
							Move Shop related stuff to a Shops module
						
						
						
						
						
						
					 | 
					
						2021-01-16 02:23:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						6bb7631382
					 | 
					
						
						
							
							fix unit tests
						
						
						
						
						
						
					 | 
					
						2021-01-03 17:16:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						d91f1e6c4d
					 | 
					
						
						
							
							Add minor glitches unittests
						
						
						
						
						
						
					 | 
					
						2020-12-21 00:44:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |