{"push_id":549014536,"size":32,"distinct_size":0,"ref":"refs/heads/mike","head":"d0d104a567fe0813dc443ce93805898546fc5b4d","before":"c102cc012f38982d62c6cf76ef5875bb5f12acf1","commits":[{"sha":"362db5180a0e0d7a232b2003eca1779b10bae941","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Added Barricade Item","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/362db5180a0e0d7a232b2003eca1779b10bae941"},{"sha":"aeeb3f2b8eab01b14208043bb939e83bb52a6673","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Edited Items","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/aeeb3f2b8eab01b14208043bb939e83bb52a6673"},{"sha":"753a06a86395d8ad0257d84a37d71ca59a4fa6e2","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross\n\nConflicts:\n\tsrc/main/java/org/zambiesurvival/engine/entity/Entity.java","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/753a06a86395d8ad0257d84a37d71ca59a4fa6e2"},{"sha":"afd39e112f5ac1aa0713f1d62c38cb91c2d67198","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Added ArmorItem and test class (to be removed)","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/afd39e112f5ac1aa0713f1d62c38cb91c2d67198"},{"sha":"ea3529e019de15b9cbcc1e561f975b8a1a3ad9ee","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Edited Entity and Item","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/ea3529e019de15b9cbcc1e561f975b8a1a3ad9ee"},{"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":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/48545b8517ee8cb08635fbb67d6cf7257f9b0c6d"},{"sha":"d54ca086a41c318b2efded5ccbc87133a4f874b6","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merged with master","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/d54ca086a41c318b2efded5ccbc87133a4f874b6"},{"sha":"547c516e78dec7776c8b567349830df4b2f1ec3a","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross\n\nConflicts:\n\tsrc/main/java/org/zambiesurvival/engine/item/BarricadeItem.java","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/547c516e78dec7776c8b567349830df4b2f1ec3a"},{"sha":"864bac25aefaa9b5dbaafdaf5a502c50a95df4c7","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/864bac25aefaa9b5dbaafdaf5a502c50a95df4c7"},{"sha":"c92e1432c92473eafb014fd7f976f5b0d36e2711","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"addItem tho","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/c92e1432c92473eafb014fd7f976f5b0d36e2711"},{"sha":"041677fe60bbd25c834201755c6fea402501b79c","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross\n\nConflicts:\n\tsrc/main/java/org/zambiesurvival/engine/item/Item.java","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/041677fe60bbd25c834201755c6fea402501b79c"},{"sha":"b62ad4931be4deadff8b10ca08c6b1002b3a5177","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Now addedItem tho","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/b62ad4931be4deadff8b10ca08c6b1002b3a5177"},{"sha":"28c005eb531474d88cac9015fbfe9f6f0367018f","author":{"email":"8ae8b39ee192ee1fad028b9f7f1e622d3e15a1d3@gmail.com","name":"Michael Francis"},"message":"Merge pull request #27 from mfrancis95/mike\n\nWorldState Decal Support","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/28c005eb531474d88cac9015fbfe9f6f0367018f"},{"sha":"2ce2f3fcf2c592c61753487daf7639e897a74755","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross\n\nConflicts:\n\tsrc/main/java/org/zambiesurvival/engine/item/ArmorItem.java","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/2ce2f3fcf2c592c61753487daf7639e897a74755"},{"sha":"1bd94d6534e74849e56307cdb7c82b28da3e52e6","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Splormatting","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/1bd94d6534e74849e56307cdb7c82b28da3e52e6"},{"sha":"7f9331cc3791b7fc5295223cfe7b5bbc0a955551","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/7f9331cc3791b7fc5295223cfe7b5bbc0a955551"},{"sha":"0fc18275879c8c75c7ea948c7bd81811190edd14","author":{"email":"8ae8b39ee192ee1fad028b9f7f1e622d3e15a1d3@gmail.com","name":"mfrancis95"},"message":"Resources","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/0fc18275879c8c75c7ea948c7bd81811190edd14"},{"sha":"64964683dc250ac35cd15a197c9d243413b60801","author":{"email":"8ae8b39ee192ee1fad028b9f7f1e622d3e15a1d3@gmail.com","name":"mfrancis95"},"message":"Got rid of the placeholder resource.","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/64964683dc250ac35cd15a197c9d243413b60801"},{"sha":"1de0035611bab85aa35a55d454365e15c7f82fdf","author":{"email":"c0564892848310d0e44e061e09892aedb41f2379@Ross-Tannenbaums-iMac-2.local","name":"RTann"},"message":"Merge branch 'master' into ross","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/1de0035611bab85aa35a55d454365e15c7f82fdf"},{"sha":"fc4c85caf41deec166cb3a8f15383e27eb669919","author":{"email":"3ed79bfdb5147d4314184b441ff1fcce7932afd6","name":"nelnel33"},"message":"Changes to GraphicTextDecal and StringImage. fontSize is parameter -- able to resize the font at will!","distinct":false,"url":"https://api.github.com/repos/mfrancis95/Zambie-Survival/commits/fc4c85caf41deec166cb3a8f15383e27eb669919"}]}