Dieselpunk is a genre in literature, art and film creating an alternative history after the events of World War II. In comparison to Steampunk, which creates an alternative history basing on steampower, Dieselpunk is less optimistic.
In both Steam- and Dieselpunk, there often are fantastic (from fantasy), weird, retrofuturistic machines playing a major role.