Commit graph

99 commits

Author SHA1 Message Date
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
Trent Hensler
5b80fdb79d Merge pull request #47 from Phroa/patch-1
Add @Override annotations
2015-10-01 13:09:28 -07:00
Jack Stratton
af5ed7162f Add @Override annotations 2015-10-01 22:09:06 +02:00
Trent Hensler
0262767fb7 Merge pull request #46 from DanielShuey/master
Update README to use proper domain language
2015-09-01 12:15:57 -05:00
DanielShuey
a5dbd3bea9 Update README to use proper domain language 2015-09-01 16:11:16 +10:00
Trent Hensler
212808a854 Merge pull request #44 from AgentTroll/patch-2
Potato is lightweight.
2015-08-26 18:26:15 -05:00
Pierre C
64d5d3cb78 Potato is lightweight.
Potato does not need extra synchronization.
2015-07-10 13:10:03 -07:00
Trent Hensler
61580991b1 Merge pull request #43 from mrlolethan/fix/compile-error
Fix compile-time error.
2015-05-16 13:28:40 -05:00
MrLolEthan
e9cdedf747 Fix compile-time error.
When throwing a NotDeliciousException, the "new" keyword wasn't being used, thus causing it to be interpreted as a method call
2015-05-16 12:17:00 -02:30
rtainc
6a6da383a9 Condiments Must Be Delicious! (v2.0) 2014-10-04 22:14:26 -04:00
Trent
d714b8394c Merge pull request #39 from xMrMysteri0us/patch-1
Add NotDeliciousException
2014-09-29 09:51:19 -05:00
xMrMysteri0us
70368c1a73 Add NotDeliciousException 2014-09-28 13:59:04 +02:00
Trent
4a17b0437b Merge pull request #35 from aerouk/patch-1
Because what does Google have to do with potatoes?
2014-09-01 20:28:24 -05:00
Tom B
579d413543 Because what does Google have to do with potatoes? 2014-09-02 02:25:53 +01:00
drtshock
28a6288b64 Merge pull request #33 from DenialMC/master
Fix image
2014-03-12 13:59:10 -05:00
Daniel
db8aa2e86f Fix image
Image was removed from the web server, now replaced with another forked potato image with Imgur.
2014-03-12 16:44:22 +02:00
drtshock
3d2b51720d Merge pull request #32 from DenialMC/master
Update: After a long wait, Potato is finally updated to 1.7.5
2014-03-10 13:50:32 -05:00