| 
							
							
								 Fabian Dill | 304f63aedf | Merge branch 'espeon' into Archipelago_Main # Conflicts:
#	playerSettings.yaml | 2021-06-21 02:49:06 +02:00 |  | 
			
				
					| 
							
							
								 espeon65536 | deff356910 | Added HMG check to all checks for OWG and NL | 2021-06-14 22:10:26 -05:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | 5ea03c71c0 | start moving some alttp options over to the new system | 2021-06-08 21:58:11 +02:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | adda0eff4a | implement Range option type | 2021-06-08 14:15:23 +02:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | b82d6cec31 | regain basic WebHost functionality | 2021-05-13 21:57:11 +02:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | daa959e353 | remove suppress rom argument | 2021-05-13 01:40:36 +02:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | 909172cbad | Factorio, Minecraft & Hollow Knight: add startinventory support | 2021-05-09 21:22:21 +02:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | 5c9aa09c80 | LttP: implement dungeonscrossed ER | 2021-05-08 12:04:03 +02:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | c4d6ac50be | turn weapons into boolean swordless | 2021-04-09 20:40:45 +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 | 3d93f659e3 | some option updates | 2021-03-14 08:38:02 +01:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | 0d576eefbb | Merge branch 'main' into breaking_changes # Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py | 2021-03-03 01:54:52 +01:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | ff9b24e88e | Hollow Knight integration (prototype status) | 2021-02-21 20:17:24 +01:00 |  | 
			
				
					| 
							
							
								 Fabian Dill | 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 |  | 
			
				
					| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 Fabian Dill | 1d58f54101 | move ALTTP to its own world folder | 2020-10-24 05:38:56 +02:00 |  |