aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2019-04-07Giant Materials/Space Compat updatebartimaeusnek
+added ASM +added a shit ton of materials and got my own Materials system up and running +added Ross128 when GC is installed Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 6e298a2662d8874903210037f7faa53d9aa83f40
2019-03-26Merge pull request #12 from bartimaeusnek/fixesbartimaeusnek
fixed circuit programmer dupe Former-commit-id: 23e6f9f936ecc0b3a68c348bcac26bcb8a4c9f89
2019-03-26fixed circuit programmer dupebartimaeusnek
-began work on Electric Implosion compressor -fixed recipes -added multi layer rotor recipes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ac86bf97f142d1fe2f1bf4da47e274441a5430a2
2019-03-20Merge pull request #8 from huajijam/masterbartimaeusnek
Fix Bug from a stupid GUY Former-commit-id: 7ca6b72eef988eddb23b6814e4b7276621102ab7
2019-03-20Merge pull request #11 from bartimaeusnek/fixesbartimaeusnek
Fixes Former-commit-id: 6ec2a238b2846f542240b72d939de73309a62a6b
2019-03-20forgot elsebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: eaf46cbf6b5df8deb3d46d3386ec791e637db265
2019-03-20smaller fixesbartimaeusnek
+no hardness or resistance on non gt te blocks +fixed possible lesu npe +maybe fixed windmill dupe? Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 738b8615f27431fbc18e1be41314378e495e6bce
2019-03-11Make the translation smooth‭huajijam
Former-commit-id: e65a76ecc1e37f2d1e50d00cc66bb6a283d147d3
2019-03-11FIX ALL BUG TRANSLATION‭huajijam
FUCK U,KIWI DO NOT FUCKING USE YOUR MACHINE TRANSLATION TO MESS UP HERE Former-commit-id: c67dc83af297417b75944e76ee68792e5b972ebb
2019-03-11Update zh_CN.langKiwi233
Former-commit-id: 939fa291e092045e40eb250c148a114a58809f4f
2019-03-11power→powderKiwi233
Former-commit-id: 932b3b265e8458bce550105453cfabc759588617
2019-03-11small fixesbartimaeusnek
-oredicted some recipes -fixed vacuum freezer voiding items -fixed non localised gui -version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: b2353ef18f835520ae3fa40bbb119093ba01c720
2019-03-09Merge branch 'master' of https://github.com/bartimaeusnek/bartworksbartimaeusnek
i forgot to pull >_> Former-commit-id: 80673f0dcdbdda6bcc1c65e0a626da291f1f950d
2019-03-09fixesbartimaeusnek
-ty piky for the bug reports =) Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 531ae727391c3fc7f8e98d6bb6a31d69d2505431
2019-02-24Merge pull request #6 from huajijam/masterbartimaeusnek
Translate Done Former-commit-id: 9cb41b6a3a435e78ff1b8f5c9cfa00f31776a562
2019-02-24added a safty mechanism to MegaMultisbartimaeusnek
+they wont accept more recipes than they can power. Former-commit-id: 627253db74fe524815410ddfec695a87b07a18d8
2019-02-23localation update,bartimaeusnek
does somewhat work... Former-commit-id: 6be56b48c05ff34b0886b3e994a499959ce1ba17
2019-02-21Fix more bugs‭huajijam
Former-commit-id: 06de74a0b8e5d6fc7065b8de38a0907ca68958b9
2019-02-21Fix bug and have better translation‭huajijam
Former-commit-id: 036b6e110fd4a88c921aba59e3ccc8374c00871c
2019-02-21Fix bug‭huajijam
Former-commit-id: 75864540f6155f61dfb3e5767985fe17b2fd99f5
2019-02-21translation done‭huajijam
Former-commit-id: 5ea54d64f12b7417f47e6e513680d2e206c55063
2019-02-21Update it‭huajijam
undone Former-commit-id: a4ac723decb2ae71502672e485d521638b831930
2019-02-19Merge branch 'master' of https://github.com/bartimaeusnek/bartworksbartimaeusnek
cause im an idiot. Former-commit-id: a31174531f8f39cde005f9738788a5949bfee999
2019-02-18removed not null annotationbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: e4ceb9284d40a3c015611aae0ad559c8e4e38a31
2019-02-18Merge pull request #5 from huajijam/masterbartimaeusnek
Creat Chinese translation LOL Former-commit-id: f94482f590a2896e276296412bbdd8cd3311a932
2019-02-18fixes and API updatebartimaeusnek
-fixed a bug where a circle dependency may exist -fixed a bug where Bacteria might be null -fixed a bug where the fallback might be wrong -fixed NBT issues with BioData -cleaned up NEI -fixed a bug where bacteria fluids might be null -optimised hashcodes to use murmur3 instead of Objects.hash Former-commit-id: a098d67778e16924b2f65e307f1b2be5131b4ce0
2019-02-18Creat Chinese translation‭huajijam
Former-commit-id: 60cb7fc217dbb94c6ebbb354fa2cf7b2a55d33ed
2019-02-15fixes diode issues with crafted diodesbartimaeusnek
+ added first work on the Infinity Tank Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: c9a4d59ff4f2513b086737b7b10778dd170450ce
2019-02-12Merge pull request #4 from bartimaeusnek/fixesbartimaeusnek
fixes Former-commit-id: d01b6078bf1bff98997f5b78e9c8e2dd1895e4d4
2019-02-12fixesbartimaeusnek
added soft dependencies, fixed stirling generator not consuming liquid when bucketed, fixed empty recipe when Crops++ is installed, fixed DEHP crash when GTNH is installed fixed DEHP not automatically starting when reaching the ground version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 2cca15cbc1be86cdbd9175a3094fda4fcc984d37
2019-02-07[ImgBot] Optimize imagesImgBotApp
*Total -- 3.00kb -> 1.67kb (44.28%) /src/main/resources/assets/bartworks/textures/GUI/GUIheatedPump.png -- 2.03kb -> 0.75kb (63.23%) /src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpTop.png -- 0.48kb -> 0.46kb (4.64%) /src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpDown.png -- 0.48kb -> 0.46kb (4.64%) Former-commit-id: bd0b7db55ff6a223a6f511e277c8ec9d3c3fd875
2019-02-07API Changesbartimaeusnek
+ added a SimpleWaterGenerator + fixed the Diode not working on servers. Former-commit-id: cd0d74153a5a1279b1ff2409eaac39fbccd5c3cf
2019-01-31+quickfix for serversbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 725142b695afbf12293813449a26d1e45d45813f
2019-01-31hughe code refractor and hughe multisbartimaeusnek
+added tooltip for Vat glas +enhanched code quality +moved glass from biolab -> new stuff +fixed diodes not working after restart +added MEBF and MVFZ +version number increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 379ceb4f37b53cb27be2f6882acf965a141d7591
2019-01-20code cleanupbartimaeusnek
+added DEHP +added travis? +added sonarcloud? +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-18[ImgBot] Optimize imagesImgBotApp
*Total -- 37.80kb -> 17.70kb (53.17%) /src/main/resources/assets/bartworks/textures/items/petriDish.png -- 2.96kb -> 0.43kb (85.46%) /BWLogo.png -- 3.88kb -> 0.63kb (83.84%) /src/main/resources/assets/bartworks/textures/GT2/gui/Destructopack.png -- 3.49kb -> 0.89kb (74.56%) /src/main/resources/assets/bartworks/textures/items/rotors/rotorPaper.png -- 1.21kb -> 0.57kb (52.91%) /src/main/resources/assets/bartworks/textures/GUI/GUIPrimitiveKUBox.png -- 1.68kb -> 0.79kb (52.71%) /src/main/resources/assets/bartworks/textures/GT2/gui/LESU.png -- 2.21kb -> 1.13kb (48.9%) /src/main/resources/assets/bartworks/textures/GUI/GUI_CircuitP.png -- 2.79kb -> 1.43kb (48.67%) /src/main/resources/assets/bartworks/textures/GUI/GUI_RSC.png -- 2.54kb -> 1.31kb (48.44%) /src/main/resources/assets/bartworks/textures/blocks/TransformerCoil.png -- 2.36kb -> 1.22kb (48.28%) /src/main/resources/assets/bartworks/textures/GUI/GUI_Windmill.png -- 2.00kb -> 1.07kb (46.53%) /src/main/resources/assets/bartworks/textures/GUI/RadHatch.png -- 2.22kb -> 1.19kb (46.52%) /src/main/resources/assets/bartworks/textures/items/rotors/rotorLeather.png -- 2.18kb -> 1.26kb (41.93%) /src/main/resources/assets/bartworks/textures/items/rotors/rotorWool.png -- 1.87kb -> 1.10kb (41.23%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/BW.GUI.BioLab.png -- 3.08kb -> 1.95kb (36.53%) /src/main/resources/assets/bartworks/textures/items/rotors/rotorCombined.png -- 2.82kb -> 2.24kb (20.68%) /src/main/resources/assets/bartworks/textures/items/rotors/paperParts.png -- 0.53kb -> 0.50kb (6.59%)
2019-01-18+fixes crash with GTNHbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-17Acid Gen Updatebartimaeusnek
+Added Simple Wind Meter for the Windmill +Added Tooltips +Changed Windmill Texture +Changed Windmill boni +hopefully fixed circuit programmer +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-14glass blocks texturebartimaeusnek
+added Connected Textures +added decorative colored blocks +added a shitton of needed Texture files +updated en_US.lang Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-13fixesbartimaeusnek
+fixes circuit programmer consuming circuit when closed on servers +fixes BioLab gui not loading +reformat code +version increase
2019-01-12Reworked Coords classbartimaeusnek
+use the MurmurHash3 and optimised equals to run in a Hashset +added credits +added URL Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-12version splittagebartimaeusnek
+the mod version now consists of 3 subversions +fixed another NPE Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-12+fixed CircuitProgrammer Deleting Chipsbartimaeusnek
+added autoconversion for basic circuits +circuit programmer now drops unsupported items instead of deleting them Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-11fixes https://github.com/bartimaeusnek/bartworks/issues/1bartimaeusnek
- added Oredict for Grindstones - adjusted tooltip for wind regions Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-01-09Bio Cultre System!bartimaeusnek
-Added the Bio Cultre System -Added the Bio Vat, Bio Lab and custom Glas types -Updated Copyright on the Files -Added a shitton of ressources -Added an API to for the Bio Cultre System -Added a Phyton Script for the ease of adding Glas Types to the Bio Vat -Fixed Spawning on custom blocks -Fixed Nuggets giving out boni in the windmill -Fixed tooltip again for the Windmill -Added dimensionsIDs to the BlockCoord class -Added apiJar, sourceJar, devJar to the grandlew output
2018-12-26fixed tooltipbartimaeusnek
+version increase
2018-12-25added Windmillbartimaeusnek
+added a shitton of Recipes and Items for it +added GUI's for them aswell
2018-12-19fixed a crash in NEIbartimaeusnek
- version update - added bartworks logo Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2018-12-17fixed a recipebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2018-12-16Version 0.1.0 out of Techdemo stagebartimaeusnek
+Added all missing texts and textures +Added Circuit Programmer +Hopefully fixed the ManualTrafo in Single Modes
generated by cgit (git 2.46.0) at 2025-03-10 17:32:24 +0000