diff --git a/faq.html b/faq.html index 4ce969d..3fc1ace 100644 --- a/faq.html +++ b/faq.html @@ -111,6 +111,6 @@ - + \ No newline at end of file diff --git a/guide.html b/guide.html index 2dfb7c0..aa60372 100644 --- a/guide.html +++ b/guide.html @@ -72,9 +72,9 @@ - + - + \ No newline at end of file diff --git a/index.html b/index.html index d5dd6de..78ab564 100644 --- a/index.html +++ b/index.html @@ -85,8 +85,8 @@

nothing here :(

- + - + \ No newline at end of file diff --git a/js/current-films.js b/js/current-films.js index fa9910c..dcdd586 100644 --- a/js/current-films.js +++ b/js/current-films.js @@ -543,40 +543,6 @@ var currentfilms = [ "flickr": "https://www.flickr.com/search/?media=photos&text=%22Ferrania%20P30%22", "image": "ferrania-p30-135.png" }, - { - "company": "Film Washi", - "name": "Film Washi A 12", - "iso": 12, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 1, - "popularity": 81, - "description": "orthochromatic film, originally intended as leader and protection during the reproduction process of motion picture films", - "launched": 2015, - "datasheet": "datasheets/film-washi-a-12.pdf", - "lomography": "https://www.lomography.com/films/871966360-film-washi-a/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20A%22", - "image": "film-washi-a-12-135.png" - }, - { - "company": "Film Washi", - "name": "Film Washi D 500", - "iso": 500, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 2, - "popularity": 155, - "description": "panchromatic aerial surveillance film", - "launched": 2015, - "datasheet": "datasheets/film-washi-d-500.pdf", - "lomography": "https://www.lomography.com/films/871963252-film-washi-d/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20D%22", - "image": "film-washi-d-500-135.png" - }, { "company": "Film Washi", "name": "Film Washi F 100", @@ -611,74 +577,6 @@ var currentfilms = [ "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20F%22", "image": "film-washi-f-100-120.png" }, - { - "company": "Film Washi", - "name": "Film Washi I 80", - "iso": 80, - "format": "120", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 2, - "popularity": 4, - "description": "orthochromatic industrial X-ray film without anti-halation layer", - "launched": 2021, - "datasheet": "datasheets/film-washi-i-80.pdf", - "lomography": "", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20I%22", - "image": "film-washi-i-80-120.png" - }, - { - "company": "Film Washi", - "name": "Film Washi R 100", - "iso": 100, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 3, - "popularity": 0, - "description": "reversal black & white panchromatic paper for photo booths", - "launched": 2020, - "datasheet": "datasheets/film-washi-r-100.pdf", - "lomography": "", - "flickr": "", - "image": "film-washi-r-100-135.png" - }, - { - "company": "Film Washi", - "name": "Film Washi S 50", - "iso": 50, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 1, - "popularity": 357, - "description": "panchromatic film, originally intended for sound recording", - "launched": 2015, - "datasheet": "datasheets/film-washi-s-50.pdf", - "lomography": "https://www.lomography.com/films/871963226-film-washi-s/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20S%22", - "image": "film-washi-s-50-135.png" - }, - { - "company": "Film Washi", - "name": "Film Washi S 50", - "iso": 50, - "format": "120", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 2, - "popularity": 357, - "description": "panchromatic film, originally intended for sound recording", - "launched": 2018, - "datasheet": "datasheets/film-washi-s-50.pdf", - "lomography": "https://www.lomography.com/films/871963226-film-washi-s/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20S%22", - "image": "film-washi-s-50-120.png" - }, { "company": "Film Washi", "name": "Film Washi V 100", @@ -760,7 +658,7 @@ var currentfilms = [ "description": "a technical film with no orange mask that can also be developed as a slide film", "launched": 2022, "datasheet": "", - "lomography": "", + "lomography": "https://www.lomography.com/films/871966009-film-washi-x/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20X%22", "image": "film-washi-x-100-135.png" }, @@ -3399,40 +3297,6 @@ var currentfilms = [ "flickr": "https://www.flickr.com/search/?media=photos&text=%22Silbersalz35%20500T%22", "image": "silbersalz35-500t-135.png" }, - { - "company": "Street Candy", - "name": "Street Candy MTN 100", - "iso": 100, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 2, - "popularity": 1, - "description": "motion picture film, probably a rebranded version of Orwo UN54", - "launched": 2021, - "datasheet": "datasheets/street-candy-mtn-100.pdf", - "lomography": "", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Street%20Candy%20MTN%20100%22", - "image": "street-candy-mtn-100-135.png" - }, - { - "company": "Street Candy", - "name": "Street Candy ATM 400", - "iso": 400, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 2, - "popularity": 228, - "description": "panchromatic film, intended for surveillance cameras, probably a rebranded version of Ilford HP5 Plus", - "launched": 2018, - "datasheet": "datasheets/street-candy-atm-400.pdf", - "lomography": "https://www.lomography.com/films/871967677-street-candy-atm-400/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Street%20Candy%20ATM%20400%22", - "image": "street-candy-atm-400-135.png" - }, { "company": "YODICA", "name": "YODICA Andromeda", diff --git a/js/discontinued-films.js b/js/discontinued-films.js index 2d6f11a..9cd7ae0 100644 --- a/js/discontinued-films.js +++ b/js/discontinued-films.js @@ -50,6 +50,108 @@ var discontinuedfilms = [ "flickr": "https://www.flickr.com/search/?media=photos&text=%22Adox%20Silvermax%20100%22", "image": "adox-silvermax-100-135.png" }, + { + "company": "Film Washi", + "name": "Film Washi A 12", + "iso": 12, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 1, + "popularity": 81, + "description": "orthochromatic film, originally intended as leader and protection during the reproduction process of motion picture films", + "launched": 2015, + "datasheet": "datasheets/film-washi-a-12.pdf", + "lomography": "https://www.lomography.com/films/871966360-film-washi-a/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20A%22", + "image": "film-washi-a-12-135.png" + }, + { + "company": "Film Washi", + "name": "Film Washi D 500", + "iso": 500, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 2, + "popularity": 155, + "description": "panchromatic aerial surveillance film", + "launched": 2015, + "datasheet": "datasheets/film-washi-d-500.pdf", + "lomography": "https://www.lomography.com/films/871963252-film-washi-d/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20D%22", + "image": "film-washi-d-500-135.png" + }, + { + "company": "Film Washi", + "name": "Film Washi I 80", + "iso": 80, + "format": "120", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 2, + "popularity": 4, + "description": "orthochromatic industrial X-ray film without anti-halation layer", + "launched": 2021, + "datasheet": "datasheets/film-washi-i-80.pdf", + "lomography": "", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20I%22", + "image": "film-washi-i-80-120.png" + }, + { + "company": "Film Washi", + "name": "Film Washi R 100", + "iso": 100, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 3, + "popularity": 0, + "description": "reversal black & white panchromatic paper for photo booths", + "launched": 2020, + "datasheet": "datasheets/film-washi-r-100.pdf", + "lomography": "", + "flickr": "", + "image": "film-washi-r-100-135.png" + }, + { + "company": "Film Washi", + "name": "Film Washi S 50", + "iso": 50, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 1, + "popularity": 357, + "description": "panchromatic film, originally intended for sound recording", + "launched": 2015, + "datasheet": "datasheets/film-washi-s-50.pdf", + "lomography": "https://www.lomography.com/films/871963226-film-washi-s/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20S%22", + "image": "film-washi-s-50-135.png" + }, + { + "company": "Film Washi", + "name": "Film Washi S 50", + "iso": 50, + "format": "120", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 2, + "popularity": 357, + "description": "panchromatic film, originally intended for sound recording", + "launched": 2018, + "datasheet": "datasheets/film-washi-s-50.pdf", + "lomography": "https://www.lomography.com/films/871963226-film-washi-s/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Film%20Washi%20S%22", + "image": "film-washi-s-50-120.png" + }, { "company": "Film Washi", "name": "Film Washi X", @@ -83,5 +185,39 @@ var discontinuedfilms = [ "lomography": "https://www.lomography.com/films/871939313-fujifilm-superia-venus-800/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Fuji%20Superia%20Venus%20800%22", "image": "images/fujifilm-superia-venus-800-135.png" + }, + { + "company": "Street Candy", + "name": "Street Candy MTN 100", + "iso": 100, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 2, + "popularity": 1, + "description": "motion picture film, probably a rebranded version of Orwo UN54", + "launched": 2021, + "datasheet": "datasheets/street-candy-mtn-100.pdf", + "lomography": "", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Street%20Candy%20MTN%20100%22", + "image": "street-candy-mtn-100-135.png" + }, + { + "company": "Street Candy", + "name": "Street Candy ATM 400", + "iso": 400, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 2, + "popularity": 228, + "description": "panchromatic film, intended for surveillance cameras, probably a rebranded version of Ilford HP5 Plus", + "launched": 2018, + "datasheet": "datasheets/street-candy-atm-400.pdf", + "lomography": "https://www.lomography.com/films/871967677-street-candy-atm-400/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Street%20Candy%20ATM%20400%22", + "image": "street-candy-atm-400-135.png" } ] \ No newline at end of file diff --git a/random.html b/random.html index 1c7d007..55f8ce4 100644 --- a/random.html +++ b/random.html @@ -71,8 +71,8 @@ - + - + \ No newline at end of file