aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-11Automatic synchronization‭huajijam
Former-commit-id: cadf2bc5fdb30d5510152910ad7dcbc930b775ff
2019-03-11Merge pull request #7 from Kiwi233/masterbartimaeusnek
Update zh_CN.lang Former-commit-id: f52ce8511117eb47fa34916f8716beadaa8b20f9
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-10Automatic synchronization‭huajijam
Former-commit-id: b4b0bc4fee732cecb2ea2cfa16291e31ae5aa1b2
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-24Automatic synchronization‭huajijam
Former-commit-id: 0f934d819b6f55411bcc415bbaae4438f370b7ec
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-24Automatic synchronization‭huajijam
Former-commit-id: 59b4b4e5dc131913cd21c6eb90e1480b03708512
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-20Automatic synchronization‭huajijam
Former-commit-id: e8bd8ce82c09b98183a40265b1c90a92d4ab7cff
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-16Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>bartimaeusnek
Former-commit-id: c8ca119374548e0ac2819fd17b4c56e6e563a14f
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-07Merge pull request #3 from bartimaeusnek/imgbotbartimaeusnek
[ImgBot] Optimize images Former-commit-id: c9285719ff3a2a9d6d505847760d8a82013d67a2
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-20removed deploy-onbartimaeusnek
Former-commit-id: a3c762dcc924bf31adc2245c1e2b8a2802083a4d
2019-01-20how i do love whitespace based languages <_<bartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7db7d5d1a683fbab44a8a43e6f6b45d245f93513
2019-01-20okay that didnt worked. will this work?bartimaeusnek
Former-commit-id: e1e8e492f6bc1326398c6dd4d966ec881872ae02
2019-01-20moved stuff inside of stages? maybe?bartimaeusnek
Former-commit-id: fb33b0b7e592d1406061b00b4e7b84aae94c4d89
2019-01-20switched sonarqube and deploy cause it didnt build the archivesbartimaeusnek
Former-commit-id: 814a8c09a0a43700355f9983b1975d9e570b28d3
2019-01-20another whitespace issure >_>bartimaeusnek
readded sonar then >_> Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 27632be2146104cbefc7ae92f3902fccb52d2832
2019-01-20screw it. no sonar then.bartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: e0fd2e50558340235450d2e87f34f4f7c59660df
2019-01-20moved sonar addon ._.bartimaeusnek
Former-commit-id: b63a547b846fb4297ea641966008575640a581ed
2019-01-20removed whitespaces o_obartimaeusnek
Former-commit-id: 537ebacc862fbcbafc3d1874b746930cc32539ab
2019-01-20redid travis file again -_-'bartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a54e0934354a13a10b34f0d3162ef86752c717b7
2019-01-20does it work now?bartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 48b4082bd1f12cab99418e388b53f8726004eceb
generated by cgit (git 2.46.0) at 2025-03-10 07:39:08 +0000