d2fc3b066c 
					 
					
						
						
							
							Rename Pokeball.java to java/Pokeball.java  
						
						 
						
						
						
						
					 
					
						2017-11-28 14:52:50 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ea6c86b0c2 
					 
					
						
						
							
							Rename Inventory.java to java/Inventory.java  
						
						 
						
						
						
						
					 
					
						2017-11-28 14:52:34 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7fc73ef2b4 
					 
					
						
						
							
							Rename Game.java to java/Game.java  
						
						 
						
						
						
						
					 
					
						2017-11-28 14:52:16 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7b8d3b65a6 
					 
					
						
						
							
							Rename issue_template.md to docs/issue_template.md  
						
						 
						
						
						
						
					 
					
						2017-11-28 14:49:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cbeca8eb5f 
					 
					
						
						
							
							Added files for compiling as jar.  
						
						 
						
						... 
						
						
						
						Added a manifest and two bat files to compile and run the software in a single jar file.
Added checking when reading pokemon to read from jar if necessary. 
						
						
					 
					
						2017-11-28 13:58:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8860f39f2c 
					 
					
						
						
							
							Rewrote some methods as non-static.  
						
						 
						
						... 
						
						
						
						Functions for getting potions, pokeballs and pokemon are now in non-static classes.
This will make it easier to manage other npc trainers in the future. 
						
						
					 
					
						2017-11-27 20:48:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b39f03c447 
					 
					
						
						
							
							Prevented extra newline on invalid integer for potion or pokeball.  
						
						 
						
						
						
						
					 
					
						2017-11-27 11:19:58 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						666c89fa8f 
					 
					
						
						
							
							Fixed some errors and issue  #14 .  
						
						 
						
						... 
						
						
						
						Capturing pokemon now happens inside the Trainer object. usersPokemon is no longer used. 
						
						
					 
					
						2017-11-27 11:11:31 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b242cfd183 
					 
					
						
						
							
							Create issue_template.md  
						
						 
						
						
						
						
					 
					
						2017-11-26 17:30:03 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BuildTools 
							
						 
					 
					
						
						
							
						
						63859fe4ae 
					 
					
						
						
							
							Replaced items with inventory. This makes it easier to validate items and add new items, but we need to remove some code repetition.  
						
						 
						
						
						
						
					 
					
						2017-11-26 14:27:38 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						948b26edf3 
					 
					
						
						
							
							Update README.md  
						
						 
						
						
						
						
					 
					
						2017-11-26 11:31:12 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b0229b71a9 
					 
					
						
						
							
							Update README.md  
						
						 
						
						
						
						
					 
					
						2017-11-26 11:30:47 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1d2de15c8c 
					 
					
						
						
							
							Created a trainer class ( #12 )  
						
						 
						
						... 
						
						
						
						Added a trainer class with a name, a list of pokemon and a list of items. Game.java has been changed to treat the player as a Trainer. 
						
						
					 
					
						2017-11-25 22:28:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bdb871d35c 
					 
					
						
						
							
							Create LICENSE  
						
						 
						
						
						
						
					 
					
						2017-11-25 15:39:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marios F 
							
						 
					 
					
						
						
							
						
						2a6a90ce13 
					 
					
						
						
							
							Added gitignore for Java ( #11 )  
						
						 
						
						... 
						
						
						
						* Added gitignore for Java
* Fixed my awful mistake 
						
						
					 
					
						2017-11-25 15:28:59 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f0313f0e04 
					 
					
						
						
							
							Update README.md  
						
						 
						
						
						
						
					 
					
						2017-11-25 10:55:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						42ff37ce5f 
					 
					
						
						
							
							Uploaded main files  
						
						 
						
						
						
						
					 
					
						2017-11-24 16:02:57 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						12265045d3 
					 
					
						
						
							
							Initial commit  
						
						 
						
						
						
						
					 
					
						2017-11-24 16:02:07 +01:00