{"push_id":536987826,"size":4,"distinct_size":1,"ref":"refs/heads/ross","head":"48545b8517ee8cb08635fbb67d6cf7257f9b0c6d","before":"ea3529e019de15b9cbcc1e561f975b8a1a3ad9ee","commits":[{"sha":"cfdfe47e7fa3f2de07074f136ddc415d84b67beb","author":{"email":"8ae8b39ee192ee1fad028b9f7f1e622d3e15a1d3@gmail.com","name":"mfrancis95"},"message":"Started work on the inventory system. Changed the screen width to 720 and started work on the side UI.","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/cfdfe47e7fa3f2de07074f136ddc415d84b67beb"},{"sha":"43e49f7e63f5a4dc50a948aa166c97c21bc91338","author":{"email":"8ae8b39ee192ee1fad028b9f7f1e622d3e15a1d3@gmail.com","name":"mfrancis95"},"message":"Started work on the inventory system. Changed the screen width to 720 and started work on the side UI.","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/43e49f7e63f5a4dc50a948aa166c97c21bc91338"},{"sha":"52b00b9747206373605f61abdd01fc278eee4c8e","author":{"email":"8ae8b39ee192ee1fad028b9f7f1e622d3e15a1d3@gmail.com","name":"mfrancis95"},"message":"Added resources placeholder again.","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/52b00b9747206373605f61abdd01fc278eee4c8e"},{"sha":"48545b8517ee8cb08635fbb67d6cf7257f9b0c6d","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross\n\nConflicts:\n\t.gitignore\n\tsrc/main/java/org/zambiesurvival/engine/entity/Entity.java\n\tsrc/main/java/org/zambiesurvival/engine/item/Bandage.java\n\tsrc/main/java/org/zambiesurvival/engine/item/HealingItem.java\n\tsrc/main/java/org/zambiesurvival/engine/item/Item.java\n\tsrc/main/java/org/zambiesurvival/engine/item/Medkit.java\n\tsrc/main/java/org/zambiesurvival/engine/item/SpawningItem.java","distinct":true,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/48545b8517ee8cb08635fbb67d6cf7257f9b0c6d"}]}