Commit graph

404 commits

Author SHA1 Message Date
TheDarkDnKTv
66aca973fe Fixed tool register system
Now the lists moved to special key system
2020-08-20 18:52:36 +03:00
TheDarkDnKTv
55b599b9e5 Added hot coolant recipe
It is still need to be balanced, refers to #39.
2020-08-20 01:41:05 +03:00
TheDarkDnKTv
4140534c16 Fixed electric tools
Also fixed not proper overriden getSubItems everywhere.

Closes #37.
2020-08-20 00:58:32 +03:00
TheDarkDnKTv
ff8f25dade Removed deprecated items
Closes #38
2020-08-19 22:46:11 +03:00
sferatime
f8a59ea901 Add tooltips localization 2020-08-19 19:29:39 +03:00
TheDarkDnKTv
23d0ad525e Cleanup 2020-08-19 19:22:39 +03:00
TheDarkDnKTv
bd37ef392b Fixed cover renders
Closes #34
2020-08-19 19:18:45 +03:00
TheDarkDnKTv
7bbaff2ae4 Misc formula fixes 2020-08-19 18:21:35 +03:00
TheDarkDnKTv
f1efdf5729 Code cleanup 2020-08-19 16:24:32 +03:00
TheDarkDnKTv
97e42b3392 Fixed fusion recipes
Closes #31
2020-08-19 16:22:34 +03:00
TheDarkDnKTv
addec91f9c Removed excess cells 2020-08-19 16:22:16 +03:00
TheDarkDnKTv
e7880f9987 Misc fixes 2020-08-19 16:21:59 +03:00
TheDarkDnKTv
55c10123d7 Fixed chemical formala low-index numbers 2020-08-19 14:58:12 +03:00
TheDarkDnKTv
5b7a871cfb Revert "Auto-pushing of liquid by output hatch"
I told you it should not be there.
This reverts commit 65c51904e0.
2020-08-19 13:33:55 +03:00
sferatime
65c51904e0 Auto-pushing of liquid by output hatch 2020-08-19 09:36:16 +03:00
TheDarkDnKTv
70652c03eb Fixed liquids locale & misc things
Closes #28
2020-08-19 02:02:39 +03:00
TheDarkDnKTv
d220ba9e23 Misc fixes 2020-08-19 01:38:35 +03:00
sferatime
1cabaf6a4c Add localization tooltips 2020-08-19 01:18:51 +03:00
TheDarkDnKTv
5938650ff0 Removed excess blocks
Closes #33
2020-08-19 00:17:52 +03:00
TheDarkDnKTv
340db82f77 Fixed Multi Stream turbine recipes 2020-08-18 23:29:18 +03:00
TheDarkDnKTv
a1d1e8f57d Fixed not working GT tools 2020-08-18 23:12:04 +03:00
TheDarkDnKTv
b438b6fa84 Fixed MetaGeneratedItem locale fully 2020-08-18 23:11:54 +03:00
sferatime
d95b814e67 Add materials & oreprefixes keys and values 2020-08-18 21:43:50 +03:00
sferatime
59271567af Add oreprefix & materials localization keys 2020-08-18 20:07:49 +03:00
TheDarkDnKTv
995bd434b8 Misc locale fixes
MetaGenerated item locale tweak added, fixed creativetab locale
Closes #29
2020-08-18 17:32:59 +03:00
TheDarkDnKTv
e4d70347e1 MetaGenerated item locale basement fixed
Closes #32
2020-08-18 17:11:18 +03:00
TheDarkDnKTv
a86c32fc6b Fixed superconductors
Closes #21
2020-08-18 16:02:33 +03:00
TheDarkDnKTv
635ede0d0d Fixed UI progress bar glitch
Closes #22
2020-08-18 15:37:55 +03:00
TheDarkDnKTv
7b0661cc37 Fixed wrong stack display name for FluidDisplayItem 2020-08-18 14:32:13 +03:00
TheDarkDnKTv
56890a0284 Added progress bar to FML loading
Added a progress bars, showing status of OreDictHandler.
2020-08-18 14:31:30 +03:00
TheDarkDnKTv
491915e969 Fixed teleporter
Closes #23, closes #27
2020-08-17 23:54:05 +03:00
TheDarkDnKTv
efcec6bb97 Some misc fixes
- Fixed bender recipes
- (Temporary) int.ciruiut tooltip fixed
Closes #25
2020-08-17 19:58:43 +03:00
TheDarkDnKTv
cb9a983efa OreDict now alive
But laggy
Closes #15, closes #19, closes #20
2020-08-17 17:34:52 +03:00
TheDarkDnKTv
d9d0340a65 Added RF compat
Closes #16
2020-08-16 23:53:11 +03:00
sferatime
8a62b60380 Add missing machine localization 2020-08-16 22:32:31 +03:00
TheDarkDnKTv
e9e329af14 Updated NEI
Closes #1
Closes #8
2020-08-16 22:06:43 +03:00
TheDarkDnKTv
85a5fcc1b4 Fixed books
Closes #9
2020-08-16 21:43:21 +03:00
TheDarkDnKTv
c07304f77b Fixed UI points
Closes #10
2020-08-16 21:28:15 +03:00
sferatime
de451f233b Add new machines UI. Closes #12 2020-08-16 21:11:09 +03:00
TheDarkDnKTv
18a6b18e45 API fixes
* Renamed MJ to RF in API
* Fixed incorrect EU consumption, closes #11
2020-08-16 21:04:49 +03:00
TheDarkDnKTv
51d5f85a73 Misc bugfixes
Fixed OreDict, closes #14, #17
2020-08-16 20:34:34 +03:00
TheDarkDnKTv
1dbdafa782 Fixed machines textures
Closes #13
2020-08-16 17:22:27 +03:00
TheDarkDnKTv
4f1ad92d2d Fixed debug item 2020-08-16 00:52:25 +03:00
TheDarkDnKTv
b035116b8b Misc fixes 2020-08-16 00:37:38 +03:00
sferatime
0adcba88fd Fix recipes 2020-08-16 00:18:28 +03:00
TheDarkDnKTv
94c3df6c12 Finally closed all syntax errors
Closes #6, milestone reached!
2020-08-15 23:52:20 +03:00
sferatime
8b6543e4d0 Made code looks nice 2020-08-15 23:16:51 +03:00
sferatime
7b03463ebc Fix machine recipes 2020-08-15 22:56:24 +03:00
TheDarkDnKTv
647b7b4194 Fixed Items texures, recipes.
Closes #7
2020-08-15 22:49:59 +03:00
TheDarkDnKTv
d5452d4e1f Some fixes 2020-08-15 21:26:01 +03:00
TheDarkDnKTv
5937ae3032 Crafting Recipe loader fixed 2020-08-15 21:07:33 +03:00
sferatime
7502c27905 Fix ItemIterator 2020-08-15 20:56:59 +03:00
TheDarkDnKTv
965de2efdf Fixed NEI package syntax errors
Closes #5
2020-08-15 00:19:35 +03:00
TheDarkDnKTv
bf7ddc204f Some last syntax fixes in common package
Closes #4
2020-08-15 00:07:58 +03:00
sferatime
1c73a539c7 Merge branch 'master' 2020-08-14 23:46:21 +03:00
sferatime
67dc8017d6 Fix GUI containers 2020-08-14 23:45:51 +03:00
TheDarkDnKTv
02a509b6a2 Fixed parts of GUI 2020-08-14 23:44:53 +03:00
TheDarkDnKTv
ee3169da3c Merge branch 'master' of https://github.com/Nukepowered/GregTech4 2020-08-14 23:23:04 +03:00
TheDarkDnKTv
dab45f5b10 Some Container work 2020-08-14 23:22:39 +03:00
sferatime
02ee80c7c3 GT_DictRegistratorPostItem add content 2020-08-14 22:55:51 +03:00
sferatime
face4735e7 Fix blocks 2020-08-14 22:41:26 +03:00
TheDarkDnKTv
cce0cfc72b Finished all MTE 2020-08-14 22:24:39 +03:00
sferatime
7d475f76bb Fix some machines 2020-08-14 21:58:15 +03:00
TheDarkDnKTv
b62edef8af More MTE work 2020-08-14 21:57:50 +03:00
TheDarkDnKTv
9aa49d342e More MTE's fixed 2020-08-14 20:24:59 +03:00
TheDarkDnKTv
d7b798374f Fixed MTE loader to API version 2020-08-14 19:56:39 +03:00
TheDarkDnKTv
288f8f9ef8 MTE Refactor 2020-08-14 19:16:10 +03:00
TheDarkDnKTv
bc004a1d92 A lot of fixes
Fixed item loader, some blocks and methods.
Now client again runs.
2020-08-14 14:15:20 +03:00
TheDarkDnKTv
d24e14e8e3 More fixes, some common package work. 2020-08-14 00:23:44 +03:00
TheDarkDnKTv
4501a77ea8 Fixed all API package itself
Now need to fix common package, loaders and NEI
2020-08-13 23:51:01 +03:00
TheDarkDnKTv
1196a2a3e1 More fixes, MTE.
@sferatime continue fixing BaseMetaTileEntity, and other MTE's.
In clases should be NO any localized strings, only through locale module.
2020-08-12 01:53:33 +03:00
TheDarkDnKTv
43f6e8dad8 More fixes of API
Fixed most of files
2020-08-11 23:51:02 +03:00
TheDarkDnKTv
364b220925 Fixed GT Utility 2020-08-11 23:07:09 +03:00
TheDarkDnKTv
c61a07d969 Fixed all items
And locale on it.
2020-08-11 22:18:24 +03:00
sferatime
ce6ec49919 Merge branch 'master' 2020-08-11 19:23:29 +03:00
sferatime
c565289f1c Some fixes 2020-08-11 19:20:02 +03:00
TheDarkDnKTv
4f292a0d75 Creative tab fix 2020-08-11 17:49:58 +03:00
TheDarkDnKTv
5bc21c29e7 Fixed GregTech_API 2020-08-11 17:45:13 +03:00
TheDarkDnKTv
63b3d62a21 More fixes after API update 2020-08-11 17:39:41 +03:00
TheDarkDnKTv
0f17679221 Some fixes 2020-08-11 02:11:25 +03:00
sferatime
a5ce1587df Some fixes 2020-08-11 01:47:51 +03:00
TheDarkDnKTv
3bfdf7c2ed Fixed logger 2020-08-11 01:15:28 +03:00
TheDarkDnKTv
aa5d62f4cc Updated to API 4.08s
Finally we did it, now we again have a lot of work.
2020-08-11 01:04:33 +03:00
TheDarkDnKTv
fbf60b8142 Fixed worldgen 2020-08-11 00:26:46 +03:00
TheDarkDnKTv
60937b3a5d Merge branch 'master' of https://github.com/Nukepowered/GregTech4 2020-08-10 01:15:05 +03:00
TheDarkDnKTv
8d8332504a Fixed spra cans
Closes #3
* Fixed spray can dupe
* Fixed some sounds names
2020-08-10 01:14:39 +03:00
sferatime
f1b9559746 Small localization fix 2020-08-10 00:19:34 +03:00
sferatime
27a39850cf Merge branch 'master' 2020-08-10 00:03:26 +03:00
sferatime
71f47dd202 Add machine localization 2020-08-10 00:02:55 +03:00
TheDarkDnKTv
34df39b5f7 Fixed compat with Thaumcraft 2020-08-09 23:55:27 +03:00
TheDarkDnKTv
34572e8eb7 Fixed Nuclear Control compat 2020-08-09 00:40:22 +03:00
sferatime
fd17a6cf56 Small recipe fix 2020-08-08 23:51:43 +03:00
TheDarkDnKTv
880679f7e3 Fixed syncronization of MTEs
Now moved to default MC channel, using TileEntity#onDataPacket now
2020-08-08 22:50:28 +03:00
TheDarkDnKTv
08f14d691a Revert "Small oregen fix"
Why did you push that awful absolutely same code? Do not push before code review next time.
2020-08-08 22:25:37 +03:00
sferatime
3d59e784eb Small oregen fix 2020-08-08 20:46:50 +03:00
TheDarkDnKTv
27979f3957 Misc fixes, old config removal 2020-08-08 16:01:38 +03:00
TheDarkDnKTv
0679ae263b More features for Debug Scanner
* Now it works both sides, shift-click - client side info, just click -
server side info.
* Shows TileEntity & Block class names
2020-08-08 15:13:50 +03:00
TheDarkDnKTv
1a137d1cbe Fixed IC2 API
Now IC2 API works fine, closes #2.
2020-08-08 15:12:43 +03:00
TheDarkDnKTv
1572a0b597 A lot of fixes
* Fixed not synchronized MetaTileEntities
* Fixed all GUI
* Misc code refactoring
2020-08-08 01:38:00 +03:00
TheDarkDnKTv
4524120ab0 Merge branch 'master' of https://github.com/Nukepowered/GregTech4
Илья, спасибо что не дождался меня.
2020-08-07 23:36:45 +03:00
TheDarkDnKTv
968fd6fd40 Some GUI fixes 2020-08-07 23:35:47 +03:00
sferatime
70f52e4d67 Fix localization v2 2020-08-07 22:38:44 +03:00
TheDarkDnKTv
2836c7290c Code review & fix 2020-08-07 22:25:01 +03:00
sferatime
402849a0a2 Small fixes 2020-08-07 21:33:54 +03:00
sferatime
5e673c90cc Fix rest of postload event 2020-08-07 21:04:30 +03:00
sferatime
d37cf51a3e Add machine localization 2020-08-07 20:45:33 +03:00
sferatime
64c3e6e2a6 Add getInventaryName 2020-08-07 19:52:32 +03:00
sferatime
d248e5fba4 Fix more machines 2020-08-07 19:38:08 +03:00
sferatime
c4929c0237 Semi-ready machine fix 2020-08-07 18:12:39 +03:00
TheDarkDnKTv
2fc51f59dd Misc fixes 2020-08-07 16:59:04 +03:00
TheDarkDnKTv
dbf4eed220 Fixed connection handler 2020-08-07 16:02:42 +03:00
TheDarkDnKTv
023ce31dae Finished networking 2020-08-07 14:21:33 +03:00
TheDarkDnKTv
9566be0b45 Some networking work 2020-08-07 01:47:17 +03:00
TheDarkDnKTv
860fecf668 Fixed MetaTileEntities 2020-08-06 23:57:29 +03:00
sferatime
400a6f1371 Fix WorldGen 2020-08-06 23:53:57 +03:00
TheDarkDnKTv
dca47ba908 A lot of work 2020-08-06 22:23:13 +03:00
sferatime
e7755f8fa2 Fix more loadstage classes 2020-08-06 20:35:03 +03:00
sferatime
3b37038aee Fix postload classes 2020-08-06 19:59:06 +03:00
TheDarkDnKTv
c5bc147460 Fixed All proxies and TickHandler 2020-08-06 17:27:54 +03:00
TheDarkDnKTv
05b5ec1c30 Nearly all lang fixed 2020-08-06 01:27:41 +03:00
sferatime
2090c99651 Merge branch 'master' of https://github.com/Nukepowered/GregTech4
# Conflicts:
#	src/main/java/gregtechmod/api/items/GT_CrowbarRC_Item.java
2020-08-06 00:06:59 +03:00
TheDarkDnKTv
f7f5dca5fa Some items fixes 2020-08-06 00:04:25 +03:00
sferatime
817257338b Add tooltip to localization 2020-08-06 00:01:54 +03:00
TheDarkDnKTv
ab5a03afaf Locale fixes 2020-08-05 22:48:13 +03:00
sferatime
213bdca24d Add item localization 2020-08-05 22:07:53 +03:00
TheDarkDnKTv
db088425a3 Init of items 2020-08-05 22:00:34 +03:00
TheDarkDnKTv
6d41f6f7d9 Finished items init 2020-08-05 20:45:51 +03:00
TheDarkDnKTv
25bf0013ce Work on items, added AT 2020-08-05 20:14:26 +03:00
TheDarkDnKTv
37f5c35892 Merge branch 'master' of https://github.com/Nukepowered/GregTech4
# Conflicts:
#	src/main/java/gregtechmod/api/items/GT_Spray_Color_Item.java
#	src/main/java/gregtechmod/loaders/load/GT_ItemLoader.java
2020-08-05 19:35:28 +03:00
TheDarkDnKTv
974c70cdd3 Fixed more items 2020-08-05 19:33:40 +03:00
sferatime
ab37044ac9 Add basic blocks localisation 2020-08-05 19:33:05 +03:00
sferatime
8969fc097c Fix rest of items 2020-08-05 18:26:37 +03:00
sferatime
a509471172 Fixes of Items 2020-08-05 16:56:08 +03:00
TheDarkDnKTv
7b69ed0b60 Work with items
Still not showing in NEI, can not find where is it register items to
GameRegistry...
2020-08-05 15:01:59 +03:00
TheDarkDnKTv
8f5b957757 Last blocks init 2020-08-05 13:50:26 +03:00
TheDarkDnKTv
6baa4b19b3 Added GT_Block_LightSource 2020-08-05 13:44:11 +03:00
TheDarkDnKTv
23937d3e9b Added more blocks
* Additional 16 blocks loading now
2020-08-05 13:36:45 +03:00
TheDarkDnKTv
ff2e33bd49 Added Ores
There is glitches with textures on sides, need to be fixed
2020-08-05 13:26:19 +03:00
TheDarkDnKTv
998c08e50b Added machine blocks
* Fixed some API register from ID to Block
* More NEI fixes
* Added first 16 machine blocks
2020-08-05 13:02:46 +03:00
TheDarkDnKTv
80aeec13a0 Finally appers something in game
Added part of GT Blocks
2020-08-05 00:51:03 +03:00
sferatime
a97063222f Small fixes 2020-08-05 00:38:38 +03:00
TheDarkDnKTv
cfe4f6c6b9 Some misc fixes in Main class 2020-08-05 00:13:10 +03:00
TheDarkDnKTv
fc89d8506d Fixed GT_Utility 2020-08-05 00:08:04 +03:00
sferatime
cc893339a9 Semi-ready proxy 2020-08-05 00:05:09 +03:00
sferatime
f64edc5a73 Semi-fix of proxy 2020-08-04 23:18:07 +03:00
sferatime
c7665d70ef Fix configuration 2020-08-04 23:02:55 +03:00
sferatime
d003289dde Small out&import fixes 2020-08-04 22:55:03 +03:00
TheDarkDnKTv
7ed0f19f87 A lot of fixes 2020-08-04 22:29:34 +03:00
sferatime
518fce4076 Small fixes 2020-08-04 19:40:33 +03:00
sferatime
84722b068a Small import fixes 2020-08-04 19:25:21 +03:00
aiyachan
590b0f8521 Fix CoverLoader 2020-08-04 17:14:08 +03:00
TheDarkDnKTv
717aa982b0 Fixed a lot of code
Fixed next classes:

* GregTech_API

* GTDummyWorld

* GT_BlockMetaID_Block
2020-08-04 16:34:53 +03:00
TheDarkDnKTv
cfd9f46038 Some initial changes
A lot of stuff need to be fixed later...
2020-08-04 00:37:38 +03:00
TheDarkDnKTv
a9da46d780 Initial commit 2020-08-03 23:26:10 +03:00