aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java8
-rw-r--r--src/main/java/gregtech/common/items/IDMetaItem02.java10
-rw-r--r--src/main/java/gregtech/common/items/MetaGeneratedItem02.java44
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java32
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.pngbin5490 -> 5493 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.pngbin5493 -> 0 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.latte.png (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png)bin5490 -> 5490 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.latte.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png.mcmeta)0
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweetcoffee.png (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png)bin5493 -> 5493 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweetcoffee.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png.mcmeta)0
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweetjesuslatte.png (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png)bin5490 -> 5490 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweetjesuslatte.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png.mcmeta)0
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweetlatte.pngbin0 -> 5490 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweetlatte.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png.mcmeta)0
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/0.pngbin754 -> 754 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/1.pngbin774 -> 793 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/100.pngbin297 -> 728 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/101.pngbin297 -> 718 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/104.pngbin308 -> 728 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/106.pngbin347 -> 617 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/107.pngbin326 -> 647 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/108.pngbin306 -> 724 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/109.pngbin315 -> 707 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/110.pngbin316 -> 630 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/111.pngbin316 -> 651 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/112.pngbin317 -> 688 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/113.pngbin361 -> 650 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/114.pngbin395 -> 730 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/115.pngbin334 -> 705 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/116.pngbin396 -> 675 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/117.pngbin404 -> 687 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/118.pngbin304 -> 753 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/119.pngbin372 -> 675 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/120.pngbin320 -> 660 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/121.pngbin320 -> 643 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/122.pngbin320 -> 690 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/123.pngbin320 -> 634 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/125.pngbin312 -> 700 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/126.pngbin392 -> 629 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/127.pngbin299 -> 736 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/128.pngbin324 -> 704 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/129.pngbin299 -> 692 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/130.pngbin324 -> 686 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/131.pngbin229 -> 691 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/132.pngbin350 -> 607 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/133.pngbin314 -> 712 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/134.pngbin347 -> 654 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/135.pngbin299 -> 691 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/136.pngbin250 -> 724 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/137.pngbin386 -> 674 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/2.pngbin391 -> 750 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.pngbin542 -> 782 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/203.pngbin591 -> 787 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/204.pngbin571 -> 827 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/205.pngbin626 -> 631 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/206.pngbin596 -> 660 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/207.pngbin541 -> 655 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/208.pngbin704 -> 756 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/209.pngbin633 -> 745 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/210.pngbin470 -> 696 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/211.pngbin447 -> 714 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.pngbin403 -> 820 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.pngbin436 -> 876 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.pngbin486 -> 856 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.pngbin475 -> 851 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.pngbin474 -> 843 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.pngbin372 -> 818 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/231.pngbin455 -> 877 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/232.pngbin464 -> 848 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.pngbin468 -> 882 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/234.pngbin416 -> 830 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.pngbin394 -> 809 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.pngbin425 -> 896 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.pngbin479 -> 824 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.pngbin486 -> 879 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/244.pngbin425 -> 841 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/3.pngbin391 -> 794 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/4.pngbin391 -> 817 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/5.pngbin391 -> 752 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/529.pngbin4379 -> 692 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/6.pngbin391 -> 755 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/7.pngbin391 -> 837 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/8.pngbin391 -> 895 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/9.pngbin391 -> 923 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateSuperdense.pngbin0 -> 7302 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateSuperdense.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/plateSuperdense_OVERLAY.pngbin0 -> 541 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/plateSuperdense.pngbin10656 -> 9386 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/plateSuperdense.pngbin0 -> 11614 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/plateSuperdense.pngbin0 -> 26384 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotprotohalkonite/plateSuperdense.pngbin935 -> 922 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/plateSuperdense.pngbin4710 -> 4823 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/plateSuperdense.pngbin3861 -> 3629 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/plateSuperdense_OVERLAY.pngbin139 -> 544 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/protohalkonite/plateSuperdense.pngbin573 -> 624 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense.pngbin32488 -> 29236 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateSuperdense_OVERLAY.pngbin141 -> 139 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/DULL/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/plateSuperdense_OVERLAY.pngbin193 -> 624 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NONE/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateSuperdense.pngbin289 -> 695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateSuperdense_OVERLAY.pngbin111 -> 534 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plateSuperdense.pngbin289 -