|  MagicBot | 82c4e3169e | Merge remote-tracking branch 'origin/unified-combat-manager' into feature-json7.3 # Conflicts:
#	src/engine/mobileAI/utilities/CombatUtilities.java | 2 years ago | 
				
					
						|  MagicBot | 84f9d54ec0 | Unused junk removed | 2 years ago | 
				
					
						|  MagicBot | 3e71cf4b45 | Unused junk removed | 2 years ago | 
				
					
						|  MagicBot | 68b9651f94 | Unused junk removed | 2 years ago | 
				
					
						|  MagicBot | 50171e4600 | TOL destroyed last in thread | 2 years ago | 
				
					
						|  FatBoy-DOTC | 9d7f2f39fe | Unified Combat System | 2 years ago | 
				
					
						|  MagicBot | a30c041a17 | Logic update | 2 years ago | 
				
					
						|  MagicBot | 756e20633f | Warehouse deleted from db | 2 years ago | 
				
					
						|  MagicBot | 12c1cde069 | Warehouse deleted from db | 2 years ago | 
				
					
						|  MagicBot | 2e0ffe67fa | Overdraft method written | 2 years ago | 
				
					
						|  MagicBot | 0c0f0aa54d | Overdraft method written | 2 years ago | 
				
					
						|  MagicBot | 538e452377 | Sql update | 2 years ago | 
				
					
						|  MagicBot | 264ce39552 | Locks saved to disk | 2 years ago | 
				
					
						|  MagicBot | b8bd71616b | Setting city when loading | 2 years ago | 
				
					
						|  MagicBot | b2f3e7a635 | Building set on load | 2 years ago | 
				
					
						|  MagicBot | e38324af63 | Building set on load | 2 years ago | 
				
					
						|  MagicBot | 5db5a26037 | Warehouse loading work. | 2 years ago | 
				
					
						|  MagicBot | 9b22287ede | Warehouse loading work. | 2 years ago | 
				
					
						|  MagicBot | 98c5b0e9ec | Warehouse loading work. | 2 years ago | 
				
					
						|  MagicBot | 0b74537bee | Warehouse loading work. | 2 years ago | 
				
					
						|  MagicBot | 5f930b0482 | Warehouse loading work. | 2 years ago | 
				
					
						|  MagicBot | aa0afa533d | Duplicate key logic makes sense here. | 2 years ago | 
				
					
						|  MagicBot | e06657e53f | Loading of warehouse data | 2 years ago | 
				
					
						|  MagicBot | a960e5ab04 | Loading of warehouse data | 2 years ago | 
				
					
						|  MagicBot | 4a9a496a5d | Refactor warehouse part two. | 2 years ago | 
				
					
						|  MagicBot | f3bfdd8a36 | Refactor warehouse part two. | 2 years ago | 
				
					
						|  MagicBot | b76a384e1f | Refactor warehouse part two. | 2 years ago | 
				
					
						|  MagicBot | 3c70a09e12 | Itembase refactor work | 2 years ago | 
				
					
						|  MagicBot | ee9b64285e | Itembase refactor work | 2 years ago | 
				
					
						|  MagicBot | 7848233396 | equip slot usage update | 2 years ago | 
				
					
						|  MagicBot | 2e05ba243f | Itembase removed from interface | 2 years ago | 
				
					
						|  MagicBot | b789c773b4 | Refactor out itembase | 2 years ago | 
				
					
						|  MagicBot | 023fd547fd | Template passed to method | 2 years ago | 
				
					
						|  MagicBot | 288c941d69 | Merge remote-tracking branch 'origin/feature-json6' into featue-json7 | 2 years ago | 
				
					
						|  MagicBot | 6b2569873c | bugfix: templateid wasn't being set | 2 years ago | 
				
					
						|  FatBoy-DOTC | 836c076884 | removed ItemBase form Combat manager | 2 years ago | 
				
					
						|  MagicBot | e4b0823911 | Refactor of item.name; simplification. | 2 years ago | 
				
					
						|  MagicBot | 3fdafe176b | Refactor of item.name; simplification. | 2 years ago | 
				
					
						|  MagicBot | c54b0470fa | More itembase refactor | 2 years ago | 
				
					
						|  MagicBot | ac2403362e | Name simplification for collection | 2 years ago | 
				
					
						|  MagicBot | 13bf6e6f5a | SQL bugfix | 2 years ago | 
				
					
						|  MagicBot | 131592090f | Deed related values parsed | 2 years ago | 
				
					
						|  MagicBot | 412fec17a6 | Deed related fields parsed in template | 2 years ago | 
				
					
						|  MagicBot | 995949c1ba | Deed fields defined in template | 2 years ago | 
				
					
						|  MagicBot | fce3fa8004 | More itembase refactor work | 2 years ago | 
				
					
						|  MagicBot | bb0803bf19 | More itembase refactor work | 2 years ago | 
				
					
						|  MagicBot | c091026114 | More itembase refactor work | 2 years ago | 
				
					
						|  MagicBot | c90461afe0 | More itembase refactor work | 2 years ago | 
				
					
						|  MagicBot | d9032f750f | More itembase refactor work | 2 years ago | 
				
					
						|  MagicBot | 55058b4ce1 | String update | 2 years ago |