Commit graph

115 commits

Author SHA1 Message Date
Trent Hensler ff9e283b33 Revert "Remove unneccessary final"
This reverts commit 54ef291398.
2016-10-28 13:29:56 -07:00
Trent Hensler eb609105ea Merge pull request #87 from j0ach1mmall3/master
Remove unneccessary final
2016-10-27 14:05:24 -07:00
Trent Hensler 5fcb5bbee7 Merge pull request #89 from stuntguy3000/imagefix
Rename resource image for better project clarification.
2016-10-17 11:27:41 -07:00
Trent Hensler e93f3e8cbe Merge pull request #90 from vemacs/patch-3
Remove public from interface
2016-10-17 11:27:19 -07:00
Trent Hensler 54dcf83d2c Merge pull request #91 from vemacs/retrolambda
Upgrade to Java 8 with Retrolambda
2016-10-17 11:27:13 -07:00
Trent Hensler e2d9994d18 Merge pull request #92 from vemacs/optimize-png
Optimize PNG
2016-10-17 11:26:51 -07:00
Trent Hensler 06991c86d0 Merge pull request #93 from vemacs/more-condiments
Add extra condiments
2016-10-17 11:26:38 -07:00
vemacs 8aec81db6a Add extra condiments 2016-10-13 12:02:51 -04:00
vemacs 29ef5c262c Optimize PNG 2016-10-13 12:00:15 -04:00
vemacs 3add51629e Upgrade to Java 8 with Retrolambda 2016-10-13 11:57:30 -04:00
Blinky™ 76a6333cdb Remove public from interface
http://docs.oracle.com/javase/specs/jls/se7/html/jls-9.html#jls-9.4
2016-10-13 11:42:17 -04:00
Luke Anderson 6d69182809
Fix GlaDOS 2016-10-13 16:27:24 +10:30
j0ach1mmall3 54ef291398 Remove unneccessary final 2016-09-28 13:00:20 +02:00
Trent Hensler 862099b76b Merge pull request #86 from vemacs/patch-2
Grammar fixes
2016-09-27 11:04:53 -07:00
Blinky™ e30ab286b6 Grammar fixes
It's Hacktoberfest again
2016-09-27 12:02:02 -05:00
Trent Hensler 5e24e6b06c Merge pull request #81 from TheRealSimJoo/master
Added the possibility to boil the potato if you have no oven
2016-05-13 15:21:21 -07:00
TheRealSimJoo c53eaed760 Merge pull request #1 from ronneke1996/master
Fixed format, added println for cooking degrees and refactored burnt …
2016-05-12 09:48:40 +02:00
Ron Nabuurs 97be05236b Fixed format, added println for cooking degrees and refactored burnt exception 2016-05-12 09:45:23 +02:00
Simon Baars bfc36e8b6e Fixed an issue with my previous commit 2016-05-11 16:11:08 +02:00
Simon Baars 0b18d29606 Added the possibility to boil the potato if you have no oven 2016-05-11 16:08:00 +02:00
Trent Hensler 23f247eaac Merge pull request #74 from externo6/patch-1
Update README.md
2016-01-15 17:31:54 -08:00
externo6 d3bae05c43 Update README.md 2016-01-13 19:57:12 +00:00
Kyle Clemens 7b12d42241 Merge pull request #72 from jomo/master
needs more Potato, fixes #71
2015-12-02 19:41:39 -05:00
jomo 560d9338b3 needs more Potato, fixes #71 2015-11-23 04:30:32 +01:00
Kyle Clemens 1947ed3c4c Merge pull request #70 from Xorgon/master
Update README.md
2015-10-30 16:27:43 -04:00
Elijah Andrews a9a271ee06 Update README.md 2015-10-30 20:26:24 +00:00
Kyle Clemens d7ef57661d Merge pull request #67 from Desetude/master
Added different ways the potato can be not delicious!
2015-10-29 12:28:07 -04:00
Kyle Clemens 8300ea9bef Merge pull request #65 from Fireflies/patch-1
Add important documentation to OvenException!
2015-10-29 12:27:52 -04:00
Desetude 8e47ab0d34 Added different ways the potato can be not delicious! 2015-10-28 17:10:49 +00:00
Connor Spencer Harries 9e1468cf52 Add important documentation to OvenException! 2015-10-28 00:37:24 +00:00
Kyle Clemens ffbb869431 Fixed: Grammar 2015-10-05 19:22:07 -04:00
Elijah Andrews b7255f1eb4 Update README.md
Added extra history about the potato
2015-10-06 00:13:58 +01:00
Trent Hensler d759cce947 Merge pull request #55 from Ichbinjoe/master
Document our potato correctly.
2015-10-02 09:51:00 -07:00
ichbinjoe 8ef4233256 Document our potato correctly. 2015-10-02 12:50:10 -04:00
Kyle Clemens d69ac87ede Updated: Formatting 2015-10-02 12:34:34 -04:00
ichbinjoe cadb9c6abc Add OvenException for oven related internal exceptions 2015-10-02 12:30:06 -04:00
Kyle Clemens 78caaec86c Updated: Readme language 2015-10-01 17:58:51 -04:00
Kyle Clemens e96e7d2e2b Merge pull request #52 from vemacs/patch-1
Update Potato.java
2015-10-01 17:50:20 -04:00
Blinky™ b140c1ac77 Update Potato.java 2015-10-01 15:49:38 -06:00
Kyle Clemens 074f15a5a6 Fixed: Work with new head 2015-10-01 17:38:35 -04:00
Kyle Clemens 0c30963c23 Fixed: Standardize spaces 2015-10-01 17:31:15 -04:00
Kyle Clemens 88f50eb9fd Merge pull request #50 from jkcclemens/master
Make the potato of a higher quality
2015-10-01 17:22:02 -04:00
Kyle Clemens 0767c48220 Added: #getCondiments() 2015-10-01 17:15:41 -04:00
Kyle Clemens 306ddeaab5 Updated: Bad formatting 2015-10-01 17:15:23 -04:00
Kyle Clemens a60ed6afd7 Added: Sweet JavaDucks 2015-10-01 17:15:13 -04:00
Kyle Clemens 0c64019755 Fixed: Remove useless return 2015-10-01 17:14:10 -04:00
Kyle Clemens 4188d9bbca Added: .gitattributes to standardize line endings 2015-10-01 17:06:08 -04:00
Kyle Clemens dcb4331b7b Updated: Ignore IDEA files 2015-10-01 17:05:13 -04:00
Trent Hensler ae4a32b73b Merge pull request #48 from SupaHam/master
Remove alien characters from our humanly potato.
2015-10-01 13:46:31 -07:00
Ali Moghnieh 7125634178 Remove alien characters from our humanly potato. 2015-10-01 21:22:35 +01:00