Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								a5efed83b9
								
							
						 | 
						
							
							
								
								Set non-LttP Shop prices to 5 to 140 Rupee range
							
							
							
							
							
						 | 
						
							2021-04-16 21:41:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								d24ee45462
								
							
						 | 
						
							
							
								
								Merge branch 'main' into Archipelago_Main
							
							
							
							
							
							
							
							# Conflicts:
#	BaseClasses.py
#	LttPAdjuster.py
#	Main.py
#	Mystery.py
#	Utils.py
#	WebHostLib/generate.py
#	playerSettings.yaml 
							
						 | 
						
							2021-04-01 11:44:37 +02:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								6455dc3ffc
								
							
						 | 
						
							
							
								
								Merge branch 'main' into breaking_changes
							
							
							
							
							
							
							
							# Conflicts:
#	README.md 
							
						 | 
						
							2021-03-13 23:34:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								a528ed5e9e
								
							
						 | 
						
							
							
								
								Client now uses location_id consistently internally, instead of switching on a dime all the time
							
							
							
							
							
							
							
							And some smaller changes 
							
						 | 
						
							2021-03-07 22:05:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								612c3c23c0
								
							
						 | 
						
							
							
								
								spheres should ignore empty locations
							
							
							
							
							
						 | 
						
							2021-02-27 18:58:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								ff9b24e88e
								
							
						 | 
						
							
							
								
								Hollow Knight integration
							
							
							
							
							
							
							
							(prototype status) 
							
						 | 
						
							2021-02-21 20:17:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								122e360ec8
								
							
						 | 
						
							
							
								
								Merge branch 'main' into breaking_changes
							
							
							
							
							
							
							
							# Conflicts:
#	MultiClient.py
#	Utils.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Shops.py 
							
						 | 
						
							2021-02-19 13:45:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								3d81f0cca7
								
							
						 | 
						
							
							
								
								update after merge from /main
							
							
							
							
							
						 | 
						
							2021-01-30 23:43:15 +01:00 |