c4d6ac50be 
								
							 
						 
						
							
							
								
								turn weapons into boolean swordless  
							
							
							
						 
						
							2021-04-09 20:40:45 +02:00  
				
					
						
							
							
								 
						
							
								f0a6b5a8e4 
								
							 
						 
						
							
							
								
								Factorio:  
							
							... 
							
							
							
							add visibility option
fix tech_cost using the wrong variable name
fix yaml defaults not init'ing the Option class
LttP:
fix potential pathing confusion in maseya palette shuffler
Server:
Minimum version per team made no sense, removed 
							
						 
						
							2021-04-08 19:53:24 +02:00  
				
					
						
							
							
								 
						
							
								250099f5fd 
								
							 
						 
						
							
							
								
								Small adjustments  
							
							
							
						 
						
							2021-04-03 20:02:15 +02:00  
				
					
						
							
							
								 
						
							
								91bcd59940 
								
							 
						 
						
							
							
								
								implement Factorio options max_science_pack and tech_cost  
							
							... 
							
							
							
							also give warnings about deprecated LttP options
also fix FactorioClient.py getting stuck if send an unknown item id
also fix !missing having an extra newline after each entry
also default to no webui 
							
						 
						
							2021-04-03 14:47:49 +02:00  
				
					
						
							
							
								 
						
							
								01ef041b86 
								
							 
						 
						
							
							
								
								last minute fixing  
							
							
							
						 
						
							2021-04-01 20:31:39 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								3d93f659e3 
								
							 
						 
						
							
							
								
								some option updates  
							
							
							
						 
						
							2021-03-14 08:38:02 +01:00  
				
					
						
							
							
								 
						
							
								4b499d2b1c 
								
							 
						 
						
							
							
								
								fix location hints not being able to get the correct text  
							
							
							
						 
						
							2021-03-14 00:27:06 +01:00  
				
					
						
							
							
								 
						
							
								6455dc3ffc 
								
							 
						 
						
							
							
								
								Merge branch 'main' into breaking_changes  
							
							... 
							
							
							
							# Conflicts:
#	README.md 
							
						 
						
							2021-03-13 23:34:38 +01:00  
				
					
						
							
							
								 
						
							
								1d6aabeea6 
								
							 
						 
						
							
							
								
								fix some missed bmbp -> apbp spots  
							
							
							
						 
						
							2021-03-03 02:02:41 +01:00  
				
					
						
							
							
								 
						
							
								bfa9bde348 
								
							 
						 
						
							
							
								
								Merge branch 'main' into breaking_changes  
							
							
							
						 
						
							2021-03-03 02:00:10 +01:00  
				
					
						
							
							
								 
						
							
								0d576eefbb 
								
							 
						 
						
							
							
								
								Merge branch 'main' into breaking_changes  
							
							... 
							
							
							
							# Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py 
							
						 
						
							2021-03-03 01:54:52 +01:00  
				
					
						
							
							
								 
						
							
								7871555620 
								
							 
						 
						
							
							
								
								Implement PrintJSON  
							
							... 
							
							
							
							Remove deprecated network packets
Make Client send new locations checked only once
Simplify register_location_checks
Rip out Server savegame compatibility 
							
						 
						
							2021-03-02 22:31:44 +01:00  
				
					
						
							
							
								 
						
							
								07b9fcfefc 
								
							 
						 
						
							
							
								
								minor cleanup  
							
							
							
						 
						
							2021-02-28 20:48:30 +01:00  
				
					
						
							
							
								 
						
							
								e60ae897b4 
								
							 
						 
						
							
							
								
								Allow HK items in shops and allow settings local/non-local items for HK  
							
							
							
						 
						
							2021-02-24 00:36:37 +01:00  
				
					
						
							
							
								 
						
							
								ff9b24e88e 
								
							 
						 
						
							
							
								
								Hollow Knight integration  
							
							... 
							
							
							
							(prototype status) 
							
						 
						
							2021-02-21 20:17:24 +01:00  
				
					
						
							
							
								 
						
							
								dcce53f8c8 
								
							 
						 
						
							
							
								
								Merge branch 'main' into breaking_changes  
							
							... 
							
							
							
							# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py 
							
						 
						
							2021-02-21 20:15:07 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								3d81f0cca7 
								
							 
						 
						
							
							
								
								update after merge from /main  
							
							
							
						 
						
							2021-01-30 23:43:15 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7333a15f1f 
								
							 
						 
						
							
							
								
								handle merge conflicts after plando update  
							
							
							
						 
						
							2021-01-17 06:54:38 +01:00  
				
					
						
							
							
								 
						
							
								514cd19367 
								
							 
						 
						
							
							
								
								Merge branch 'main' into breaking_changes  
							
							... 
							
							
							
							# Conflicts:
#	BaseClasses.py
#	Mystery.py
#	WebHostLib/downloads.py
#	WebHostLib/models.py
#	WebHostLib/templates/macros.html
#	WebHostLib/upload.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py 
							
						 
						
							2021-01-17 06:50:25 +01:00  
				
					
						
							
							
								 
						
							
								08ca4245c1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into breaking_changes  
							
							... 
							
							
							
							# Conflicts:
#	Adjuster.py
#	AdjusterMain.py
#	BaseClasses.py
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
#	Utils.py
#	WebHostLib/downloads.py
#	WebHostLib/generate.py
#	dumpSprites.py
#	test/TestBase.py
#	worlds/alttp/EntranceRandomizer.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py 
							
						 
						
							2021-01-03 13:13:59 +01:00  
				
					
						
							
							
								 
						
							
								4de64eab84 
								
							 
						 
						
							
							
								
								update Options system  #2  
							
							
							
						 
						
							2020-10-24 19:46:13 +02:00  
				
					
						
							
							
								 
						
							
								1d58f54101 
								
							 
						 
						
							
							
								
								move ALTTP to its own world folder  
							
							
							
						 
						
							2020-10-24 05:38:56 +02:00